@prosopo/provider 2.0.1 → 2.0.3

package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasks.cjs

@@ -29,7 +29,7 @@ class ImgCaptchaManager {
     }
     return captchaDocs;
   }
-  async getRandomCaptchasAndRequestHash(datasetId, userAccount) {
+  async getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress) {
     const dataset = await this.db.getDatasetDetails(datasetId);
     if (!dataset) {
       throw new common.ProsopoEnvError("DATABASE.DATASET_GET_FAILED", {
@@ -66,8 +66,8 @@ class ImgCaptchaManager {
       salt
     );
     const currentTime = Date.now();
-    const signedTimestamp = util$1.u8aToHex(
-      this.pair.sign(util$1.stringToHex(currentTime.toString()))
+    const signedRequestHash = util$1.u8aToHex(
+      this.pair.sign(util$1.stringToHex(requestHash))
     );
     const timeLimit = captchas.map((captcha) => captcha.timeLimitMs || types.DEFAULT_IMAGE_CAPTCHA_TIMEOUT).reduce((a, b) => a + b, 0);
     const deadlineTs = timeLimit + currentTime;
@@ -77,13 +77,14 @@ class ImgCaptchaManager {
       requestHash,
       salt,
       deadlineTs,
-      currentBlockNumber
+      currentTime,
+      ipAddress
     );
     return {
       captchas,
       requestHash,
       timestamp: currentTime,
-      signedTimestamp
+      signedRequestHash
     };
   }
   /**
@@ -92,35 +93,36 @@ class ImgCaptchaManager {
    * @param {string} dappAccount
    * @param {string} requestHash
    * @param {JSON} captchas
-   * @param {string} requestHashSignature
+   * @param {string} userRequestHashSignature
    * @param timestamp
-   * @param timestampSignature
+   * @param providerRequestHashSignature
+   * @param ipAddress
    * @return {Promise<DappUserSolutionResult>} result containing the contract event
    */
-  async dappUserSolution(userAccount, dappAccount, requestHash, captchas, requestHashSignature, timestamp, timestampSignature) {
+  async dappUserSolution(userAccount, dappAccount, requestHash, captchas, userRequestHashSignature, timestamp, providerRequestHashSignature, ipAddress) {
     const verification = utilCrypto.signatureVerify(
       util$1.stringToHex(requestHash),
-      requestHashSignature,
+      userRequestHashSignature,
       userAccount
     );
     if (!verification.isValid) {
-      this.logger.info("Invalid requestHash signature");
+      this.logger.info("Invalid user requestHash signature");
       throw new common.ProsopoEnvError("GENERAL.INVALID_SIGNATURE", {
         context: { failedFuncName: this.dappUserSolution.name, userAccount }
       });
     }
-    const timestampSigVerify = utilCrypto.signatureVerify(
-      util$1.stringToHex(timestamp.toString()),
-      timestampSignature,
+    const providerRequestHashSignatureVerify = utilCrypto.signatureVerify(
+      util$1.stringToHex(requestHash.toString()),
+      providerRequestHashSignature,
       this.pair.address
     );
-    if (!timestampSigVerify.isValid) {
-      this.logger.info("Invalid timestamp signature");
+    if (!providerRequestHashSignatureVerify.isValid) {
+      this.logger.info("Invalid provider requestHash signature");
       throw new common.ProsopoEnvError("GENERAL.INVALID_SIGNATURE", {
         context: {
           failedFuncName: this.dappUserSolution.name,
           userAccount,
-          error: "timestamp signature is invalid"
+          error: "requestHash signature is invalid"
         }
       });
     }
@@ -136,7 +138,6 @@ class ImgCaptchaManager {
       userAccount,
       unverifiedCaptchaIds
     );
-    console.log("Pending request", pendingRequest);
     if (pendingRequest) {
       const { storedCaptchas, receivedCaptchas, captchaIds } = await this.validateReceivedCaptchasAgainstStoredCaptchas(captchas);
       const { tree, commitmentId } = imgCaptchaTasksUtils.buildTreeAndGetCommitmentId(receivedCaptchas);
@@ -146,28 +147,21 @@ class ImgCaptchaManager {
           context: { failedFuncName: this.dappUserSolution.name }
         });
       }
-      const userSignature = util$1.hexToU8a(requestHashSignature);
       await this.db.updateDappUserPendingStatus(requestHash);
       const commit = {
         id: commitmentId,
         userAccount,
-        dappContract: dappAccount,
+        dappAccount,
         providerAccount: this.pair.address,
         datasetId,
-        status: types.CaptchaStatus.pending,
-        userSignature: Array.from(userSignature),
-        requestedAt: pendingRecord.requestedAtBlock,
-        // TODO is this correct or should it be block number?
-        completedAt: 0,
-        //temp
-        processed: false,
-        batched: false,
-        stored: false,
-        requestedAtTimestamp: timestamp
+        result: { status: types.CaptchaStatus.pending },
+        userSignature: userRequestHashSignature,
+        userSubmitted: true,
+        serverChecked: false,
+        requestedAtTimestamp: timestamp,
+        ipAddress
       };
       await this.db.storeDappUserSolution(receivedCaptchas, commit);
-      console.log(receivedCaptchas);
-      console.log(storedCaptchas);
       if (datasets.compareCaptchaSolutions(receivedCaptchas, storedCaptchas)) {
         response = {
           captchas: captchaIds.map((id) => ({
@@ -178,6 +172,10 @@ class ImgCaptchaManager {
         };
         await this.db.approveDappUserCommitment(commitmentId);
       } else {
+        await this.db.disapproveDappUserCommitment(
+          commitmentId,
+          "CAPTCHA.INVALID_SOLUTION"
+        );
         response = {
           captchas: captchaIds.map((id) => ({
             captchaId: id,
@@ -262,11 +260,14 @@ class ImgCaptchaManager {
     return dappUserSolution;
   }
   /* Check if dapp user has verified solution in cache */
-  async getDappUserCommitmentByAccount(userAccount) {
-    const dappUserSolutions = await this.db.getDappUserCommitmentByAccount(userAccount);
+  async getDappUserCommitmentByAccount(userAccount, dappAccount) {
+    const dappUserSolutions = await this.db.getDappUserCommitmentByAccount(
+      userAccount,
+      dappAccount
+    );
     if (dappUserSolutions.length > 0) {
       for (const dappUserSolution of dappUserSolutions) {
-        if (dappUserSolution.status === types.CaptchaStatus.approved) {
+        if (dappUserSolution.result.status === types.CaptchaStatus.approved) {
           return dappUserSolution;
         }
       }

package/dist/cjs/tasks/powCaptcha/powTasks.cjs

@@ -5,6 +5,7 @@ const common = require("@prosopo/common");
 const types = require("@prosopo/types");
 const util$1 = require("@prosopo/util");
 const powTasksUtils = require("./powTasksUtils.cjs");
+const logger = common.getLoggerDefault();
 class PowCaptchaManager {
   constructor(pair, db) {
     this.pair = pair;
@@ -20,18 +21,14 @@ class PowCaptchaManager {
    */
   async getPowCaptchaChallenge(userAccount, dappAccount, origin) {
     const difficulty = 4;
-    const timestamp = Date.now();
-    const challenge = `${timestamp}___${userAccount}___${dappAccount}`;
+    const requestedAtTimestamp = Date.now();
+    const challenge = `${requestedAtTimestamp}___${userAccount}___${dappAccount}`;
     const challengeSignature = util.u8aToHex(this.pair.sign(util.stringToHex(challenge)));
-    const timestampSignature = util.u8aToHex(
-      this.pair.sign(util.stringToHex(timestamp.toString()))
-    );
     return {
       challenge,
       difficulty,
-      signature: challengeSignature,
-      timestamp,
-      timestampSignature
+      providerSignature: challengeSignature,
+      requestedAtTimestamp
     };
   }
   /**
@@ -39,36 +36,62 @@ class PowCaptchaManager {
    *
    * @param {string} challenge - the starting string for the PoW challenge
    * @param {string} difficulty - how many leading zeroes the solution must have
-   * @param {string} signature - proof that the Provider provided the challenge
+   * @param {string} providerChallengeSignature - proof that the Provider provided the challenge
    * @param {string} nonce - the string that the user has found that satisfies the PoW challenge
    * @param {number} timeout - the time in milliseconds since the Provider was selected to provide the PoW captcha
-   * @param timestampSignature
+   * @param {string} userTimestampSignature
+   * @param ipAddress
    */
-  async verifyPowCaptchaSolution(challenge, difficulty, signature, nonce, timeout, timestampSignature) {
-    powTasksUtils.checkRecentPowSolution(challenge, timeout);
+  async verifyPowCaptchaSolution(challenge, difficulty, providerChallengeSignature, nonce, timeout, userTimestampSignature, ipAddress) {
+    powTasksUtils.checkPowSignature(
+      challenge,
+      providerChallengeSignature,
+      this.pair.address,
+      types.ApiParams.challenge
+    );
     const challengeSplit = challenge.split(this.POW_SEPARATOR);
     const timestamp = parseInt(util$1.at(challengeSplit, 0));
     const userAccount = util$1.at(challengeSplit, 1);
-    const dappAccount = util$1.at(challengeSplit, 2);
     powTasksUtils.checkPowSignature(
       timestamp.toString(),
-      timestampSignature,
+      userTimestampSignature,
       userAccount,
       types.ApiParams.timestamp
     );
-    powTasksUtils.checkPowSignature(
-      challenge,
-      signature,
-      this.pair.address,
-      types.ApiParams.challenge
-    );
-    powTasksUtils.checkPowSolution(nonce, challenge, difficulty);
-    await this.db.storePowCaptchaRecord(
+    const challengeRecord = await this.db.getPowCaptchaRecordByChallenge(challenge);
+    if (!challengeRecord) {
+      logger.debug("No record of this challenge");
+      return false;
+    }
+    if (!util$1.verifyRecency(challenge, timeout)) {
+      await this.db.updatePowCaptchaRecord(
+        challenge,
+        {
+          status: types.CaptchaStatus.disapproved,
+          reason: "CAPTCHA.INVALID_TIMESTAMP"
+        },
+        false,
+        true,
+        userTimestampSignature
+      );
+      return false;
+    }
+    const correct = powTasksUtils.validateSolution(nonce, challenge, difficulty);
+    let result = { status: types.CaptchaStatus.approved };
+    if (!correct) {
+      result = {
+        status: types.CaptchaStatus.disapproved,
+        reason: "CAPTCHA.INVALID_SOLUTION"
+      };
+    }
+    await this.db.updatePowCaptchaRecord(
       challenge,
-      { timestamp, userAccount, dappAccount },
-      false
+      result,
+      false,
+      true,
+      userTimestampSignature
     );
-    return true;
+    return correct;
   }
   /**
    * @description Verifies a PoW Captcha for a given user and dapp. This is called by the server to verify the user's solution
@@ -88,7 +111,7 @@ class PowCaptchaManager {
         }
       });
     }
-    if (challengeRecord.checked) return false;
+    if (challengeRecord.serverChecked) return false;
     const challengeDappAccount = challengeRecord.dappAccount;
     if (dappAccount !== challengeDappAccount) {
       throw new common.ProsopoEnvError("CAPTCHA.DAPP_USER_SOLUTION_NOT_FOUND", {
@@ -99,8 +122,10 @@ class PowCaptchaManager {
         }
       });
     }
-    powTasksUtils.checkRecentPowSolution(challenge, timeout);
-    await this.db.updatePowCaptchaRecord(challengeRecord.challenge, true);
+    util$1.verifyRecency(challenge, timeout);
+    await this.db.markDappUserPoWCommitmentsChecked([
+      challengeRecord.challenge
+    ]);
     return true;
   }
 }

package/dist/cjs/tasks/powCaptcha/powTasksUtils.cjs

@@ -4,22 +4,7 @@ const sha256 = require("@noble/hashes/sha256");
 const util = require("@polkadot/util");
 const utilCrypto = require("@polkadot/util-crypto");
 const common = require("@prosopo/common");
-const contract = require("@prosopo/contract");
 const validateSolution = (nonce, challenge, difficulty) => Array.from(sha256.sha256(new TextEncoder().encode(nonce + challenge))).map((byte) => byte.toString(16).padStart(2, "0")).join("").startsWith("0".repeat(difficulty));
-const checkPowSolution = (nonce, challenge, difficulty) => {
-  const solutionValid = validateSolution(nonce, challenge, difficulty);
-  if (!solutionValid) {
-    throw new common.ProsopoContractError("API.CAPTCHA_FAILED", {
-      context: {
-        ERROR: "Captcha solution is invalid",
-        failedFuncName: checkPowSolution.name,
-        nonce,
-        challenge,
-        difficulty
-      }
-    });
-  }
-};
 const checkPowSignature = (challenge, signature, address, signatureType) => {
   const signatureVerification = utilCrypto.signatureVerify(
     util.stringToHex(challenge),
@@ -37,19 +22,5 @@ const checkPowSignature = (challenge, signature, address, signatureType) => {
     });
   }
 };
-const checkRecentPowSolution = (challenge, timeout) => {
-  const recent = contract.verifyRecency(challenge, timeout);
-  if (!recent) {
-    throw new common.ProsopoContractError("CONTRACT.INVALID_BLOCKHASH", {
-      context: {
-        ERROR: `Block in which the Provider was selected must be within the last ${timeout / 1e3} seconds`,
-        failedFuncName: checkRecentPowSolution.name,
-        challenge
-      }
-    });
-  }
-};
 exports.checkPowSignature = checkPowSignature;
-exports.checkPowSolution = checkPowSolution;
-exports.checkRecentPowSolution = checkRecentPowSolution;
 exports.validateSolution = validateSolution;

package/dist/cjs/util.cjs

@@ -26,27 +26,6 @@ function shuffleArray(array) {
   }
   return array;
 }
-async function promiseQueue(array) {
-  const ret = [];
-  await [...array, () => Promise.resolve(void 0)].reduce(
-    (promise, curr, i) => {
-      return promise.then((res) => {
-        if (res) {
-          ret.push({ data: res });
-        }
-        return curr();
-      }).catch((err) => {
-        ret.push({ data: err });
-        return curr();
-      });
-    },
-    Promise.resolve(void 0)
-  );
-  return ret;
-}
-function parseBlockNumber(blockNumberString) {
-  return Number.parseInt(blockNumberString.replace(/,/g, ""));
-}
 async function checkIfTaskIsRunning(taskName, db) {
   const runningTask = await db.getLastScheduledTaskStatus(
     taskName,
@@ -54,7 +33,7 @@ async function checkIfTaskIsRunning(taskName, db) {
   );
   if (runningTask) {
     const completedTask = await db.getScheduledTaskStatus(
-      runningTask.taskId,
+      runningTask.id,
       types.ScheduledTaskStatus.Completed
     );
     return !completedTask;
@@ -63,6 +42,4 @@ async function checkIfTaskIsRunning(taskName, db) {
 }
 exports.checkIfTaskIsRunning = checkIfTaskIsRunning;
 exports.encodeStringAddress = encodeStringAddress;
-exports.parseBlockNumber = parseBlockNumber;
-exports.promiseQueue = promiseQueue;
 exports.shuffleArray = shuffleArray;

package/dist/tasks/dataset/datasetTasks.d.ts

@@ -1,6 +1,6 @@
-import type { Logger } from "@prosopo/common";
-import type { CaptchaConfig, DatasetRaw, ProsopoConfigOutput, StoredEvents } from "@prosopo/types";
+import { CaptchaConfig, DatasetRaw, ProsopoConfigOutput, StoredEvents } from "@prosopo/types";
 import type { Database } from "@prosopo/types-database";
+import type { Logger } from "@prosopo/common";
 export declare class DatasetManager {
     config: ProsopoConfigOutput;
     logger: Logger;

package/dist/tasks/dataset/datasetTasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datasetTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAgB9C,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EAEV,mBAAmB,EACnB,YAAY,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,QAAQ,EAAwB,MAAM,yBAAyB,CAAC;AAG9E,qBAAa,cAAc;IACzB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;IAC7B,EAAE,EAAE,QAAQ,CAAC;gBAGX,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,QAAQ;IAaR,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrD,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBzD,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM;IAYxD,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;CAoBhD"}
+{"version":3,"file":"datasetTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasks.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,aAAa,EACb,UAAU,EACV,mBAAmB,EAGnB,YAAY,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG9C,qBAAa,cAAc;IACzB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;IAC7B,EAAE,EAAE,QAAQ,CAAC;gBAGX,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,QAAQ;IAaR,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrD,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBzD,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM;IAYxD,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;CA8FhD"}

package/dist/tasks/dataset/datasetTasks.js

@@ -1,6 +1,7 @@
-import { saveCaptchaEvent, saveCaptchas } from "@prosopo/database";
 import { parseCaptchaDataset } from "@prosopo/datasets";
+import { ScheduledTaskNames, ScheduledTaskStatus, } from "@prosopo/types";
 import { providerValidateDataset } from "./datasetTasksUtils.js";
+import { saveCaptchaEvent, saveCaptchas } from "@prosopo/database";
 export class DatasetManager {
     constructor(config, logger, captchaConfig, db) {
         this.config = config;
@@ -28,13 +29,43 @@ export 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 saveCaptchas(commitments, powRecords, this.config.mongoCaptchaUri);
-        await this.db.markDappUserCommitmentsStored(commitments.map((commitment) => commitment.id));
-        await this.db.markDappUserPoWCommitmentsStored(powRecords.map((powRecords) => powRecords.challenge));
+        const lastTask = await this.db.getLastScheduledTaskStatus(ScheduledTaskNames.StoreCommitmentsExternal, ScheduledTaskStatus.Completed);
+        const taskID = await this.db.createScheduledTaskStatus(ScheduledTaskNames.StoreCommitmentsExternal, 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 &&
+                        (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 saveCaptchas(commitments, powRecords, this.config.mongoCaptchaUri);
+                await this.db.markDappUserCommitmentsStored(commitments.map((commitment) => commitment.id));
+                await this.db.markDappUserPoWCommitmentsStored(powRecords.map((powRecords) => powRecords.challenge));
+            }
+            await this.db.updateScheduledTaskStatus(taskID, 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, ScheduledTaskStatus.Failed, { error: e.toString() });
+        }
     }
 }
 //# sourceMappingURL=datasetTasks.js.map

package/dist/tasks/dataset/datasetTasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"datasetTasks.js","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAcnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AASxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,OAAO,cAAc;IAMzB,YACE,MAA2B,EAC3B,MAAc,EACd,aAA4B,EAC5B,EAAY;QAEZ,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAOD,KAAK,CAAC,0BAA0B,CAAC,IAAU;QACzC,MAAM,UAAU,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,UAAsB;QAC7C,MAAM,OAAO,GAAG,MAAM,uBAAuB,CAC3C,UAAU,EACV,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,EAC/B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAClC,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAWD,KAAK,CAAC,gBAAgB,CAAC,MAAoB,EAAE,SAAiB;QAC5D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;YAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;YACxE,OAAO;SACR;QACD,MAAM,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACxE,CAAC;IAMD,KAAK,CAAC,wBAAwB;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACtC,OAAO;SACR;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,8BAA8B,EAAE,CAAC;QACnE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,WAAW,CAAC,MAAM,yBAAyB,CAAC,CAAC;QAEzE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,iCAAiC,EAAE,CAAC;QACrE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,UAAU,CAAC,MAAM,4BAA4B,CAAC,CAAC;QAE3E,MAAM,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACzE,MAAM,IAAI,CAAC,EAAE,CAAC,6BAA6B,CACzC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAC/C,CAAC;QACF,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAC5C,UAAU,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CACrD,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"datasetTasks.js","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasks.ts"],"names":[],"mappings":"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"}

package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts

@@ -1,7 +1,7 @@
 import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
 import { type Captcha, type CaptchaConfig, type CaptchaSolution, type DappUserSolutionResult, type Hash, type PendingCaptchaRequest } from "@prosopo/types";
-import type { Database, UserCommitmentRecord } from "@prosopo/types-database";
+import { Database, UserCommitment } from "@prosopo/types-database";
 export declare class ImgCaptchaManager {
     db: Database;
     pair: KeyringPair;
@@ -9,20 +9,20 @@ export declare class ImgCaptchaManager {
     captchaConfig: CaptchaConfig;
     constructor(db: Database, pair: KeyringPair, logger: Logger, captchaConfig: CaptchaConfig);
     getCaptchaWithProof(datasetId: Hash, solved: boolean, size: number): Promise<Captcha[]>;
-    getRandomCaptchasAndRequestHash(datasetId: string, userAccount: string): Promise<{
+    getRandomCaptchasAndRequestHash(datasetId: string, userAccount: string, ipAddress: string): Promise<{
         captchas: Captcha[];
         requestHash: string;
         timestamp: number;
-        signedTimestamp: string;
+        signedRequestHash: string;
     }>;
-    dappUserSolution(userAccount: string, dappAccount: string, requestHash: string, captchas: CaptchaSolution[], requestHashSignature: string, timestamp: number, timestampSignature: string): Promise<DappUserSolutionResult>;
+    dappUserSolution(userAccount: string, dappAccount: string, requestHash: string, captchas: CaptchaSolution[], userRequestHashSignature: string, timestamp: number, providerRequestHashSignature: string, ipAddress: string): Promise<DappUserSolutionResult>;
     validateReceivedCaptchasAgainstStoredCaptchas(captchas: CaptchaSolution[]): Promise<{
         storedCaptchas: Captcha[];
         receivedCaptchas: CaptchaSolution[];
         captchaIds: string[];
     }>;
     validateDappUserSolutionRequestIsPending(requestHash: string, pendingRecord: PendingCaptchaRequest, userAccount: string, captchaIds: string[]): Promise<boolean>;
-    getDappUserCommitmentById(commitmentId: string): Promise<UserCommitmentRecord>;
-    getDappUserCommitmentByAccount(userAccount: string): Promise<UserCommitmentRecord | undefined>;
+    getDappUserCommitmentById(commitmentId: string): Promise<UserCommitment>;
+    getDappUserCommitmentByAccount(userAccount: string, dappAccount: string): Promise<UserCommitment | undefined>;
 }
 //# sourceMappingURL=imgCaptchaTasks.d.ts.map

package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imgCaptchaTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAM/D,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,eAAe,EAGpB,KAAK,sBAAsB,EAC3B,KAAK,IAAI,EACT,KAAK,qBAAqB,EAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAK9E,qBAAa,iBAAiB;IAC5B,EAAE,EAAE,QAAQ,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;gBAG3B,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa;IAQxB,mBAAmB,CACvB,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,EAAE,CAAC;IAgBf,+BAA+B,CACnC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QACT,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IA8EI,gBAAgB,CACpB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,oBAAoB,EAAE,MAAM,EAC5B,SAAS,EAAE,MAAM,EACjB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,sBAAsB,CAAC;IAmH5B,6CAA6C,CACjD,QAAQ,EAAE,eAAe,EAAE,GAC1B,OAAO,CAAC;QACT,cAAc,EAAE,OAAO,EAAE,CAAC;QAC1B,gBAAgB,EAAE,eAAe,EAAE,CAAC;QACpC,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB,CAAC;IAqCI,wCAAwC,CAC5C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,qBAAqB,EACpC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,OAAO,CAAC;IA2Bb,yBAAyB,CAC7B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,oBAAoB,CAAC;IAe1B,8BAA8B,CAClC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;CAY7C"}
+{"version":3,"file":"imgCaptchaTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAM/D,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,eAAe,EAEpB,KAAK,sBAAsB,EAE3B,KAAK,IAAI,EACT,KAAK,qBAAqB,EAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,QAAQ,EAER,cAAc,EACf,MAAM,yBAAyB,CAAC;AAKjC,qBAAa,iBAAiB;IAC5B,EAAE,EAAE,QAAQ,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;gBAG3B,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa;IAQxB,mBAAmB,CACvB,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,EAAE,CAAC;IAgBf,+BAA+B,CACnC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;QACT,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;IAgFI,gBAAgB,CACpB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,wBAAwB,EAAE,MAAM,EAChC,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,MAAM,EACpC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,sBAAsB,CAAC;IAiH5B,6CAA6C,CACjD,QAAQ,EAAE,eAAe,EAAE,GAC1B,OAAO,CAAC;QACT,cAAc,EAAE,OAAO,EAAE,CAAC;QAC1B,gBAAgB,EAAE,eAAe,EAAE,CAAC;QACpC,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB,CAAC;IAqCI,wCAAwC,CAC5C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,qBAAqB,EACpC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,OAAO,CAAC;IA2Bb,yBAAyB,CAC7B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,cAAc,CAAC;IAepB,8BAA8B,CAClC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;CAcvC"}

package/dist/tasks/imgCaptcha/imgCaptchaTasks.js

@@ -1,4 +1,4 @@
-import { hexToU8a, stringToHex, u8aToHex } from "@polkadot/util";
+import { stringToHex, u8aToHex } from "@polkadot/util";
 import { randomAsHex, signatureVerify } from "@polkadot/util-crypto";
 import { ProsopoEnvError } from "@prosopo/common";
 import { compareCaptchaSolutions, computePendingRequestHash, parseAndSortCaptchaSolutions, } from "@prosopo/datasets";
@@ -27,7 +27,7 @@ export class ImgCaptchaManager {
         }
         return captchaDocs;
     }
-    async getRandomCaptchasAndRequestHash(datasetId, userAccount) {
+    async getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress) {
         const dataset = await this.db.getDatasetDetails(datasetId);
         if (!dataset) {
             throw new ProsopoEnvError("DATABASE.DATASET_GET_FAILED", {
@@ -52,36 +52,36 @@ export class ImgCaptchaManager {
         const salt = randomAsHex();
         const requestHash = computePendingRequestHash(captchas.map((c) => c.captchaId), userAccount, salt);
         const currentTime = Date.now();
-        const signedTimestamp = u8aToHex(this.pair.sign(stringToHex(currentTime.toString())));
+        const signedRequestHash = u8aToHex(this.pair.sign(stringToHex(requestHash)));
         const timeLimit = captchas
             .map((captcha) => captcha.timeLimitMs || DEFAULT_IMAGE_CAPTCHA_TIMEOUT)
             .reduce((a, b) => a + b, 0);
         const deadlineTs = timeLimit + currentTime;
         const currentBlockNumber = 0;
-        await this.db.storeDappUserPending(userAccount, requestHash, salt, deadlineTs, currentBlockNumber);
+        await this.db.storeDappUserPending(userAccount, requestHash, salt, deadlineTs, currentTime, ipAddress);
         return {
             captchas,
             requestHash,
             timestamp: currentTime,
-            signedTimestamp,
+            signedRequestHash,
         };
     }
-    async dappUserSolution(userAccount, dappAccount, requestHash, captchas, requestHashSignature, timestamp, timestampSignature) {
-        const verification = signatureVerify(stringToHex(requestHash), requestHashSignature, userAccount);
+    async dappUserSolution(userAccount, dappAccount, requestHash, captchas, userRequestHashSignature, timestamp, providerRequestHashSignature, ipAddress) {
+        const verification = signatureVerify(stringToHex(requestHash), userRequestHashSignature, userAccount);
         if (!verification.isValid) {
-            this.logger.info("Invalid requestHash signature");
+            this.logger.info("Invalid user requestHash signature");
             throw new ProsopoEnvError("GENERAL.INVALID_SIGNATURE", {
                 context: { failedFuncName: this.dappUserSolution.name, userAccount },
             });
         }
-        const timestampSigVerify = signatureVerify(stringToHex(timestamp.toString()), timestampSignature, this.pair.address);
-        if (!timestampSigVerify.isValid) {
-            this.logger.info("Invalid timestamp signature");
+        const providerRequestHashSignatureVerify = signatureVerify(stringToHex(requestHash.toString()), providerRequestHashSignature, this.pair.address);
+        if (!providerRequestHashSignatureVerify.isValid) {
+            this.logger.info("Invalid provider requestHash signature");
             throw new ProsopoEnvError("GENERAL.INVALID_SIGNATURE", {
                 context: {
                     failedFuncName: this.dappUserSolution.name,
                     userAccount,
-                    error: "timestamp signature is invalid",
+                    error: "requestHash signature is invalid",
                 },
             });
         }
@@ -92,7 +92,6 @@ export class ImgCaptchaManager {
         const pendingRecord = await this.db.getDappUserPending(requestHash);
         const unverifiedCaptchaIds = captchas.map((captcha) => captcha.captchaId);
         const pendingRequest = await this.validateDappUserSolutionRequestIsPending(requestHash, pendingRecord, userAccount, unverifiedCaptchaIds);
-        console.log("Pending request", pendingRequest);
         if (pendingRequest) {
             const { storedCaptchas, receivedCaptchas, captchaIds } = await this.validateReceivedCaptchasAgainstStoredCaptchas(captchas);
             const { tree, commitmentId } = buildTreeAndGetCommitmentId(receivedCaptchas);
@@ -102,26 +101,21 @@ export class ImgCaptchaManager {
                     context: { failedFuncName: this.dappUserSolution.name },
                 });
             }
-            const userSignature = hexToU8a(requestHashSignature);
             await this.db.updateDappUserPendingStatus(requestHash);
             const commit = {
                 id: commitmentId,
                 userAccount: userAccount,
-                dappContract: dappAccount,
+                dappAccount,
                 providerAccount: this.pair.address,
                 datasetId,
-                status: CaptchaStatus.pending,
-                userSignature: Array.from(userSignature),
-                requestedAt: pendingRecord.requestedAtBlock,
-                completedAt: 0,
-                processed: false,
-                batched: false,
-                stored: false,
+                result: { status: CaptchaStatus.pending },
+                userSignature: userRequestHashSignature,
+                userSubmitted: true,
+                serverChecked: false,
                 requestedAtTimestamp: timestamp,
+                ipAddress,
             };
             await this.db.storeDappUserSolution(receivedCaptchas, commit);
-            console.log(receivedCaptchas);
-            console.log(storedCaptchas);
             if (compareCaptchaSolutions(receivedCaptchas, storedCaptchas)) {
                 response = {
                     captchas: captchaIds.map((id) => ({
@@ -133,6 +127,7 @@ export class ImgCaptchaManager {
                 await this.db.approveDappUserCommitment(commitmentId);
             }
             else {
+                await this.db.disapproveDappUserCommitment(commitmentId, "CAPTCHA.INVALID_SOLUTION");
                 response = {
                     captchas: captchaIds.map((id) => ({
                         captchaId: id,
@@ -197,11 +192,11 @@ export class ImgCaptchaManager {
         }
         return dappUserSolution;
     }
-    async getDappUserCommitmentByAccount(userAccount) {
-        const dappUserSolutions = await this.db.getDappUserCommitmentByAccount(userAccount);
+    async getDappUserCommitmentByAccount(userAccount, dappAccount) {
+        const dappUserSolutions = await this.db.getDappUserCommitmentByAccount(userAccount, dappAccount);
         if (dappUserSolutions.length > 0) {
             for (const dappUserSolution of dappUserSolutions) {
-                if (dappUserSolution.status === CaptchaStatus.approved) {
+                if (dappUserSolution.result.status === CaptchaStatus.approved) {
                     return dappUserSolution;
                 }
             }