@prosopo/provider 2.0.1 → 2.0.3

package/dist/api/captcha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAU/C,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA+N9D"}
+{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAY/C,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA0O9D"}

package/dist/api/captcha.js

@@ -6,16 +6,18 @@ import { version } from "@prosopo/util";
 import express from "express";
 import { Tasks } from "../tasks/tasks.js";
 import { handleErrors } from "./errorHandler.js";
+const NO_IP_ADDRESS = "NO_IP_ADDRESS";
 export function prosopoRouter(env) {
     const router = express.Router();
     const tasks = new Tasks(env);
-    router.get(`${ApiPaths.GetImageCaptchaChallenge}/:${ApiParams.datasetId}/:${ApiParams.user}/:${ApiParams.dapp}/:${ApiParams.blockNumber}`, async (req, res, next) => {
+    const GetImageCaptchaChallengePath = `${ApiPaths.GetImageCaptchaChallenge}/:${ApiParams.datasetId}/:${ApiParams.user}/:${ApiParams.dapp}`;
+    router.get(GetImageCaptchaChallengePath, async (req, res, next) => {
         try {
             const { datasetId, user } = CaptchaRequestBody.parse(req.params);
             validateAddress(user, false, 42);
-            const taskData = await tasks.imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, user);
+            const taskData = await tasks.imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, user, req.ip || NO_IP_ADDRESS);
             const captchaResponse = {
-                captchas: taskData.captchas.map((captcha) => ({
+                [ApiParams.captchas]: taskData.captchas.map((captcha) => ({
                     ...captcha,
                     items: captcha.items.map((item) => parseCaptchaAssets(item, env.assetsResolver)),
                 })),
@@ -23,7 +25,7 @@ export function prosopoRouter(env) {
                 [ApiParams.timestamp]: taskData.timestamp.toString(),
                 [ApiParams.signature]: {
                     [ApiParams.provider]: {
-                        [ApiParams.timestamp]: taskData.signedTimestamp,
+                        [ApiParams.requestHash]: taskData.signedRequestHash,
                     },
                 },
             };
@@ -47,7 +49,7 @@ export function prosopoRouter(env) {
             }));
         }
         try {
-            const result = await tasks.imgCaptchaManager.dappUserSolution(parsed[ApiParams.user], parsed[ApiParams.dapp], parsed[ApiParams.requestHash], parsed[ApiParams.captchas], parsed[ApiParams.signature].user.requestHash, parseInt(parsed[ApiParams.timestamp]), parsed[ApiParams.signature].provider.timestamp);
+            const result = await tasks.imgCaptchaManager.dappUserSolution(parsed[ApiParams.user], parsed[ApiParams.dapp], parsed[ApiParams.requestHash], parsed[ApiParams.captchas], parsed[ApiParams.signature].user.requestHash, parseInt(parsed[ApiParams.timestamp]), parsed[ApiParams.signature].provider.requestHash, req.ip || NO_IP_ADDRESS);
             const returnValue = {
                 status: req.i18n.t(result.verified ? "API.CAPTCHA_PASSED" : "API.CAPTCHA_FAILED"),
                 ...result,
@@ -71,14 +73,18 @@ export function prosopoRouter(env) {
                 });
             }
             const challenge = await tasks.powCaptchaManager.getPowCaptchaChallenge(user, dapp, origin);
+            await tasks.db.storePowCaptchaRecord(challenge.challenge, {
+                requestedAtTimestamp: challenge.requestedAtTimestamp,
+                userAccount: user,
+                dappAccount: dapp,
+            }, challenge.difficulty, challenge.providerSignature, req.ip || NO_IP_ADDRESS);
             const getPowCaptchaResponse = {
                 challenge: challenge.challenge,
                 difficulty: challenge.difficulty,
-                timestamp: challenge.timestamp.toString(),
+                timestamp: challenge.requestedAtTimestamp.toString(),
                 signature: {
                     provider: {
-                        timestamp: challenge.timestampSignature,
-                        challenge: challenge.signature,
+                        challenge: challenge.providerSignature,
                     },
                 },
             };
@@ -94,7 +100,7 @@ export function prosopoRouter(env) {
     router.post(ApiPaths.SubmitPowCaptchaSolution, async (req, res, next) => {
         try {
             const { challenge, difficulty, signature, nonce, verifiedTimeout } = SubmitPowCaptchaSolutionBody.parse(req.body);
-            const verified = await tasks.powCaptchaManager.verifyPowCaptchaSolution(challenge, difficulty, signature.provider.challenge, nonce, verifiedTimeout, signature.user.timestamp);
+            const verified = await tasks.powCaptchaManager.verifyPowCaptchaSolution(challenge, difficulty, signature.provider.challenge, nonce, verifiedTimeout, signature.user.timestamp, req.ip || NO_IP_ADDRESS);
             const response = { verified };
             return res.json(response);
         }

package/dist/api/captcha.js.map

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

package/dist/api/captchaScheduler.d.ts

@@ -1,4 +1,4 @@
 import type { KeyringPair } from "@polkadot/keyring/types";
-import type { ProsopoConfigOutput } from "@prosopo/types";
+import { ProsopoConfigOutput } from "@prosopo/types";
 export declare function storeCaptchasExternally(pair: KeyringPair, config: ProsopoConfigOutput): Promise<void>;
 //# sourceMappingURL=captchaScheduler.d.ts.map

package/dist/api/captchaScheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captchaScheduler.d.ts","sourceRoot":"","sources":["../../src/api/captchaScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAiB1D,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,iBAuB5B"}
+{"version":3,"file":"captchaScheduler.d.ts","sourceRoot":"","sources":["../../src/api/captchaScheduler.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAKzE,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,iBAkC5B"}

package/dist/api/captchaScheduler.js

@@ -1,6 +1,8 @@
 import { ProviderEnvironment } from "@prosopo/env";
+import { ScheduledTaskNames } from "@prosopo/types";
 import { CronJob } from "cron";
 import { Tasks } from "../tasks/tasks.js";
+import { checkIfTaskIsRunning } from "../util.js";
 export async function storeCaptchasExternally(pair, config) {
     const env = new ProviderEnvironment(config, pair);
     await env.isReady();
@@ -12,10 +14,14 @@ export async function storeCaptchasExternally(pair, config) {
             : defaultSchedule
         : defaultSchedule;
     const job = new CronJob(cronSchedule, async () => {
-        env.logger.log("storeCommitmentsExternal task....");
-        await tasks.datasetManager.storeCommitmentsExternal().catch((err) => {
-            env.logger.error(err);
-        });
+        const taskRunning = await checkIfTaskIsRunning(ScheduledTaskNames.StoreCommitmentsExternal, env.getDb());
+        env.logger.info(`${ScheduledTaskNames.StoreCommitmentsExternal} task running: ${taskRunning}`);
+        if (!taskRunning) {
+            env.logger.info(`${ScheduledTaskNames.StoreCommitmentsExternal} task....`);
+            await tasks.datasetManager.storeCommitmentsExternal().catch((err) => {
+                env.logger.error(err);
+            });
+        }
     });
     job.start();
 }

package/dist/api/captchaScheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"captchaScheduler.js","sourceRoot":"","sources":["../../src/api/captchaScheduler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAenD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,IAAiB,EACjB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAG7B,MAAM,eAAe,GAAG,WAAW,CAAC;IACpC,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB;QAC1C,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ;YAChC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ;YAClC,CAAC,CAAC,eAAe;QACnB,CAAC,CAAC,eAAe,CAAC;IAEpB,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC/C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QACpD,MAAM,KAAK,CAAC,cAAc,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAClE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACd,CAAC"}
+{"version":3,"file":"captchaScheduler.js","sourceRoot":"","sources":["../../src/api/captchaScheduler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAuB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,IAAiB,EACjB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAG7B,MAAM,eAAe,GAAG,WAAW,CAAC;IACpC,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB;QAC1C,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ;YAChC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ;YAClC,CAAC,CAAC,eAAe;QACnB,CAAC,CAAC,eAAe,CAAC;IAEpB,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAC5C,kBAAkB,CAAC,wBAAwB,EAC3C,GAAG,CAAC,KAAK,EAAE,CACZ,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,GAAG,kBAAkB,CAAC,wBAAwB,kBAAkB,WAAW,EAAE,CAC9E,CAAC;QACF,IAAI,CAAC,WAAW,EAAE;YAChB,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,GAAG,kBAAkB,CAAC,wBAAwB,WAAW,CAC1D,CAAC;YACF,MAAM,KAAK,CAAC,cAAc,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAClE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACd,CAAC"}

package/dist/api/verify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAgB,EAIf,KAAK,MAAM,EACX,MAAM,SAAS,CAAC;AAWjB,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAqMpE"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAgB,EAId,KAAK,MAAM,EACZ,MAAM,SAAS,CAAC;AAWjB,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAkNpE"}

package/dist/api/verify.js

@@ -11,15 +11,15 @@ export function prosopoVerifyRouter(env) {
     async function verifyImageSolution(res, req, next, isDapp) {
         const parsed = VerifySolutionBody.parse(req.body);
         try {
-            const { dappUserSignature, token } = parsed;
-            const { user, dapp, blockNumber, commitmentId } = decodeProcaptchaOutput(token);
+            const { dappSignature, token } = parsed;
+            const { user, dapp, timestamp, commitmentId } = decodeProcaptchaOutput(token);
             const keyPair = isDapp
                 ? env.keyring.addFromAddress(dapp)
                 : env.keyring.addFromAddress(user);
-            verifySignature(dappUserSignature, blockNumber.toString(), keyPair);
+            verifySignature(dappSignature, timestamp.toString(), keyPair);
             const solution = await (commitmentId
                 ? tasks.imgCaptchaManager.getDappUserCommitmentById(commitmentId)
-                : tasks.imgCaptchaManager.getDappUserCommitmentByAccount(user));
+                : tasks.imgCaptchaManager.getDappUserCommitmentByAccount(user, dapp));
             if (!solution) {
                 tasks.logger.debug("Not verified - no solution found");
                 const noSolutionResponse = {
@@ -28,7 +28,21 @@ export function prosopoVerifyRouter(env) {
                 };
                 return res.json(noSolutionResponse);
             }
-            if (solution.status === CaptchaStatus.disapproved) {
+            if (isDapp) {
+                if (solution.serverChecked) {
+                    const alreadyCheckedResponse = {
+                        [ApiParams.status]: req.t("API.USER_ALREADY_VERIFIED"),
+                        [ApiParams.verified]: false,
+                    };
+                    return res.json(alreadyCheckedResponse);
+                }
+                else {
+                    await tasks.imgCaptchaManager.db.markDappUserCommitmentsChecked([
+                        solution.id,
+                    ]);
+                }
+            }
+            if (solution.result.status === CaptchaStatus.disapproved) {
                 const disapprovedResponse = {
                     [ApiParams.status]: req.t("API.USER_NOT_VERIFIED"),
                     [ApiParams.verified]: false,
@@ -48,12 +62,11 @@ export function prosopoVerifyRouter(env) {
                     return res.json(expiredResponse);
                 }
             }
-            const isApproved = solution.status === CaptchaStatus.approved;
+            const isApproved = solution.result.status === CaptchaStatus.approved;
             const response = {
                 [ApiParams.status]: req.t(isApproved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
                 [ApiParams.verified]: isApproved,
                 [ApiParams.commitmentId]: solution.id.toString(),
-                [ApiParams.blockNumber]: solution.requestedAt,
             };
             return res.json(response);
         }
@@ -86,7 +99,7 @@ export function prosopoVerifyRouter(env) {
     router.post(ApiPaths.VerifyPowCaptchaSolution, async (req, res, next) => {
         try {
             const { token, dappSignature, verifiedTimeout } = ServerPowCaptchaVerifyRequestBody.parse(req.body);
-            const { dapp, blockNumber, challenge } = decodeProcaptchaOutput(token);
+            const { dapp, timestamp, challenge } = decodeProcaptchaOutput(token);
             if (!challenge) {
                 const unverifiedResponse = {
                     status: req.t("API.USER_NOT_VERIFIED"),
@@ -95,7 +108,7 @@ export function prosopoVerifyRouter(env) {
                 return res.json(unverifiedResponse);
             }
             const dappPair = env.keyring.addFromAddress(dapp);
-            verifySignature(dappSignature, blockNumber.toString(), dappPair);
+            verifySignature(dappSignature, timestamp.toString(), dappPair);
             const approved = await tasks.powCaptchaManager.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
             const verificationResponse = {
                 status: req.t(approved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),

package/dist/api/verify.js.map

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

package/dist/cjs/api/captcha.cjs

@@ -8,45 +8,45 @@ const util = require("@prosopo/util");
 const express = require("express");
 const tasks = require("../tasks/tasks.cjs");
 const errorHandler = require("./errorHandler.cjs");
+const NO_IP_ADDRESS = "NO_IP_ADDRESS";
 function prosopoRouter(env) {
   const router = express.Router();
   const tasks$1 = new tasks.Tasks(env);
-  router.get(
-    `${types.ApiPaths.GetImageCaptchaChallenge}/:${types.ApiParams.datasetId}/:${types.ApiParams.user}/:${types.ApiParams.dapp}/:${types.ApiParams.blockNumber}`,
-    async (req, res, next) => {
-      try {
-        const { datasetId, user } = types.CaptchaRequestBody.parse(req.params);
-        address.validateAddress(user, false, 42);
-        const taskData = await tasks$1.imgCaptchaManager.getRandomCaptchasAndRequestHash(
-          datasetId,
-          user
-        );
-        const captchaResponse = {
-          captchas: taskData.captchas.map((captcha) => ({
-            ...captcha,
-            items: captcha.items.map(
-              (item) => datasets.parseCaptchaAssets(item, env.assetsResolver)
-            )
-          })),
-          [types.ApiParams.requestHash]: taskData.requestHash,
-          [types.ApiParams.timestamp]: taskData.timestamp.toString(),
-          [types.ApiParams.signature]: {
-            [types.ApiParams.provider]: {
-              [types.ApiParams.timestamp]: taskData.signedTimestamp
-            }
+  const GetImageCaptchaChallengePath = `${types.ApiPaths.GetImageCaptchaChallenge}/:${types.ApiParams.datasetId}/:${types.ApiParams.user}/:${types.ApiParams.dapp}`;
+  router.get(GetImageCaptchaChallengePath, async (req, res, next) => {
+    try {
+      const { datasetId, user } = types.CaptchaRequestBody.parse(req.params);
+      address.validateAddress(user, false, 42);
+      const taskData = await tasks$1.imgCaptchaManager.getRandomCaptchasAndRequestHash(
+        datasetId,
+        user,
+        req.ip || NO_IP_ADDRESS
+      );
+      const captchaResponse = {
+        [types.ApiParams.captchas]: taskData.captchas.map((captcha) => ({
+          ...captcha,
+          items: captcha.items.map(
+            (item) => datasets.parseCaptchaAssets(item, env.assetsResolver)
+          )
+        })),
+        [types.ApiParams.requestHash]: taskData.requestHash,
+        [types.ApiParams.timestamp]: taskData.timestamp.toString(),
+        [types.ApiParams.signature]: {
+          [types.ApiParams.provider]: {
+            [types.ApiParams.requestHash]: taskData.signedRequestHash
           }
-        };
-        return res.json(captchaResponse);
-      } catch (err) {
-        tasks$1.logger.error(err);
-        return next(
-          new common.ProsopoApiError("API.BAD_REQUEST", {
-            context: { error: err, code: 400 }
-          })
-        );
-      }
+        }
+      };
+      return res.json(captchaResponse);
+    } catch (err) {
+      tasks$1.logger.error(err);
+      return next(
+        new common.ProsopoApiError("API.BAD_REQUEST", {
+          context: { error: err, code: 400 }
+        })
+      );
     }
-  );
+  });
   router.post(types.ApiPaths.SubmitImageCaptchaSolution, async (req, res, next) => {
     let parsed;
     try {
@@ -66,7 +66,8 @@ function prosopoRouter(env) {
         parsed[types.ApiParams.captchas],
         parsed[types.ApiParams.signature].user.requestHash,
         parseInt(parsed[types.ApiParams.timestamp]),
-        parsed[types.ApiParams.signature].provider.timestamp
+        parsed[types.ApiParams.signature].provider.requestHash,
+        req.ip || NO_IP_ADDRESS
       );
       const returnValue = {
         status: req.i18n.t(
@@ -98,14 +99,24 @@ function prosopoRouter(env) {
         dapp,
         origin
       );
+      await tasks$1.db.storePowCaptchaRecord(
+        challenge.challenge,
+        {
+          requestedAtTimestamp: challenge.requestedAtTimestamp,
+          userAccount: user,
+          dappAccount: dapp
+        },
+        challenge.difficulty,
+        challenge.providerSignature,
+        req.ip || NO_IP_ADDRESS
+      );
       const getPowCaptchaResponse = {
         challenge: challenge.challenge,
         difficulty: challenge.difficulty,
-        timestamp: challenge.timestamp.toString(),
+        timestamp: challenge.requestedAtTimestamp.toString(),
         signature: {
           provider: {
-            timestamp: challenge.timestampSignature,
-            challenge: challenge.signature
+            challenge: challenge.providerSignature
           }
         }
       };
@@ -128,7 +139,8 @@ function prosopoRouter(env) {
         signature.provider.challenge,
         nonce,
         verifiedTimeout,
-        signature.user.timestamp
+        signature.user.timestamp,
+        req.ip || NO_IP_ADDRESS
       );
       const response = { verified };
       return res.json(response);

package/dist/cjs/api/captchaScheduler.cjs

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const env = require("@prosopo/env");
+const types = require("@prosopo/types");
 const cron = require("cron");
 const tasks = require("../tasks/tasks.cjs");
+const util = require("../util.cjs");
 async function storeCaptchasExternally(pair, config) {
   const env$1 = new env.ProviderEnvironment(config, pair);
   await env$1.isReady();
@@ -10,10 +12,21 @@ async function storeCaptchasExternally(pair, config) {
   const defaultSchedule = "0 * * * *";
   const cronSchedule = config.captchaScheduler ? config.captchaScheduler.schedule ? config.captchaScheduler.schedule : defaultSchedule : defaultSchedule;
   const job = new cron.CronJob(cronSchedule, async () => {
-    env$1.logger.log("storeCommitmentsExternal task....");
-    await tasks$1.datasetManager.storeCommitmentsExternal().catch((err) => {
-      env$1.logger.error(err);
-    });
+    const taskRunning = await util.checkIfTaskIsRunning(
+      types.ScheduledTaskNames.StoreCommitmentsExternal,
+      env$1.getDb()
+    );
+    env$1.logger.info(
+      `${types.ScheduledTaskNames.StoreCommitmentsExternal} task running: ${taskRunning}`
+    );
+    if (!taskRunning) {
+      env$1.logger.info(
+        `${types.ScheduledTaskNames.StoreCommitmentsExternal} task....`
+      );
+      await tasks$1.datasetManager.storeCommitmentsExternal().catch((err) => {
+        env$1.logger.error(err);
+      });
+    }
   });
   job.start();
 }

package/dist/cjs/api/verify.cjs

@@ -12,11 +12,11 @@ function prosopoVerifyRouter(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 { dappSignature, token } = parsed;
+      const { user, dapp, timestamp, 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.imgCaptchaManager.getDappUserCommitmentById(commitmentId) : tasks$1.imgCaptchaManager.getDappUserCommitmentByAccount(user));
+      authMiddleware.verifySignature(dappSignature, timestamp.toString(), keyPair);
+      const solution = await (commitmentId ? tasks$1.imgCaptchaManager.getDappUserCommitmentById(commitmentId) : tasks$1.imgCaptchaManager.getDappUserCommitmentByAccount(user, dapp));
       if (!solution) {
         tasks$1.logger.debug("Not verified - no solution found");
         const noSolutionResponse = {
@@ -25,7 +25,20 @@ function prosopoVerifyRouter(env) {
         };
         return res.json(noSolutionResponse);
       }
-      if (solution.status === types.CaptchaStatus.disapproved) {
+      if (isDapp) {
+        if (solution.serverChecked) {
+          const alreadyCheckedResponse = {
+            [types.ApiParams.status]: req.t("API.USER_ALREADY_VERIFIED"),
+            [types.ApiParams.verified]: false
+          };
+          return res.json(alreadyCheckedResponse);
+        } else {
+          await tasks$1.imgCaptchaManager.db.markDappUserCommitmentsChecked([
+            solution.id
+          ]);
+        }
+      }
+      if (solution.result.status === types.CaptchaStatus.disapproved) {
         const disapprovedResponse = {
           [types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED"),
           [types.ApiParams.verified]: false
@@ -45,14 +58,13 @@ function prosopoVerifyRouter(env) {
           return res.json(expiredResponse);
         }
       }
-      const isApproved = solution.status === types.CaptchaStatus.approved;
+      const isApproved = solution.result.status === types.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
+        [types.ApiParams.commitmentId]: solution.id.toString()
       };
       return res.json(response);
     } catch (err) {
@@ -94,7 +106,7 @@ function prosopoVerifyRouter(env) {
   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);
+      const { dapp, timestamp, challenge } = types.decodeProcaptchaOutput(token);
       if (!challenge) {
         const unverifiedResponse = {
           status: req.t("API.USER_NOT_VERIFIED"),
@@ -103,7 +115,7 @@ function prosopoVerifyRouter(env) {
         return res.json(unverifiedResponse);
       }
       const dappPair = env.keyring.addFromAddress(dapp);
-      authMiddleware.verifySignature(dappSignature, blockNumber.toString(), dappPair);
+      authMiddleware.verifySignature(dappSignature, timestamp.toString(), dappPair);
       const approved = await tasks$1.powCaptchaManager.serverVerifyPowCaptchaSolution(
         dapp,
         challenge,

package/dist/cjs/index.cjs

@@ -10,8 +10,6 @@ const captchaScheduler = require("./api/captchaScheduler.cjs");
 const tasks = require("./tasks/tasks.cjs");
 exports.checkIfTaskIsRunning = util.checkIfTaskIsRunning;
 exports.encodeStringAddress = util.encodeStringAddress;
-exports.parseBlockNumber = util.parseBlockNumber;
-exports.promiseQueue = util.promiseQueue;
 exports.shuffleArray = util.shuffleArray;
 exports.prosopoRouter = captcha.prosopoRouter;
 exports.prosopoVerifyRouter = verify.prosopoVerifyRouter;

package/dist/cjs/tasks/dataset/datasetTasks.cjs

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const database = require("@prosopo/database");
 const datasets = require("@prosopo/datasets");
+const types = require("@prosopo/types");
 const datasetTasksUtils = require("./datasetTasksUtils.cjs");
+const database = require("@prosopo/database");
 class DatasetManager {
   constructor(config, logger, captchaConfig, db) {
     this.config = config;
@@ -44,7 +45,7 @@ class DatasetManager {
     await database.saveCaptchaEvent(events, accountId, this.config.mongoEventsUri);
   }
   /**
-   * @description Store commitments externally in the database, clear them from local cache
+   * @description Store commitments externally in the database
    * @returns
    */
   async storeCommitmentsExternal() {
@@ -52,17 +53,73 @@ class DatasetManager {
       this.logger.info("Mongo env not set");
       return;
     }
-    const commitments = await this.db.getUnstoredDappUserCommitments();
-    this.logger.info(`Storing ${commitments.length} commitments externally`);
-    const powRecords = await this.db.getUnstoredDappUserPoWCommitments();
-    this.logger.info(`Storing ${powRecords.length} pow challenges externally`);
-    await database.saveCaptchas(commitments, powRecords, this.config.mongoCaptchaUri);
-    await this.db.markDappUserCommitmentsStored(
-      commitments.map((commitment) => commitment.id)
+    const lastTask = await this.db.getLastScheduledTaskStatus(
+      types.ScheduledTaskNames.StoreCommitmentsExternal,
+      types.ScheduledTaskStatus.Completed
     );
-    await this.db.markDappUserPoWCommitmentsStored(
-      powRecords.map((powRecords2) => powRecords2.challenge)
+    const taskID = await this.db.createScheduledTaskStatus(
+      types.ScheduledTaskNames.StoreCommitmentsExternal,
+      types.ScheduledTaskStatus.Running
     );
+    try {
+      let commitments = await this.db.getUnstoredDappUserCommitments();
+      let powRecords = await this.db.getUnstoredDappUserPoWCommitments();
+      if (lastTask) {
+        this.logger.info(
+          `Filtering records to only get updated records: ${JSON.stringify(lastTask)}`
+        );
+        this.logger.info(
+          "Last task ran at ",
+          new Date(lastTask.updated || 0),
+          "Task ID",
+          taskID
+        );
+        commitments = commitments.filter(
+          (commitment) => lastTask.updated && commitment.lastUpdatedTimestamp && (commitment.lastUpdatedTimestamp > lastTask.updated || !commitment.lastUpdatedTimestamp)
+        );
+        powRecords = powRecords.filter((commitment) => {
+          return lastTask.updated && commitment.lastUpdatedTimestamp && // either the update stamp is more recent than the last time this task ran or there is no update stamp,
+          // so it is a new record
+          (commitment.lastUpdatedTimestamp > lastTask.updated || !commitment.lastUpdatedTimestamp);
+        });
+      }
+      if (commitments.length || powRecords.length) {
+        this.logger.info(
+          `Storing ${commitments.length} commitments externally`
+        );
+        this.logger.info(
+          `Storing ${powRecords.length} pow challenges externally`
+        );
+        await database.saveCaptchas(
+          commitments,
+          powRecords,
+          this.config.mongoCaptchaUri
+        );
+        await this.db.markDappUserCommitmentsStored(
+          commitments.map((commitment) => commitment.id)
+        );
+        await this.db.markDappUserPoWCommitmentsStored(
+          powRecords.map((powRecords2) => powRecords2.challenge)
+        );
+      }
+      await this.db.updateScheduledTaskStatus(
+        taskID,
+        types.ScheduledTaskStatus.Completed,
+        {
+          data: {
+            commitments: commitments.map((c) => c.id),
+            powRecords: powRecords.map((pr) => pr.challenge)
+          }
+        }
+      );
+    } catch (e) {
+      this.logger.error(e);
+      await this.db.updateScheduledTaskStatus(
+        taskID,
+        types.ScheduledTaskStatus.Failed,
+        { error: e.toString() }
+      );
+    }
   }
 }
 exports.DatasetManager = DatasetManager;