Fix recording oracle algorithm to clasify workers solutions (#2582)

Update assignment status for rejected solutions in exchange oracle

Author: flopez7

packages/apps/fortune/exchange-oracle/server/src/modules/assignment/assignment.repository.ts

@@ -39,6 +39,19 @@ export class AssignmentRepository extends BaseRepository<AssignmentEntity> {
     });
   }
 
+  public async findOneByEscrowAndWorker(
+    escrowAddress: string,
+    chainId: ChainId,
+    workerAddress: string,
+  ): Promise<AssignmentEntity | null> {
+    return this.findOne({
+      where: {
+        job: { escrowAddress, chainId },
+        workerAddress,
+      },
+    });
+  }
+
   public async findOneById(
     assignmentId: number,
   ): Promise<AssignmentEntity | null> {

packages/apps/fortune/exchange-oracle/server/src/modules/job/job.service.spec.ts

@@ -9,10 +9,7 @@ import { HttpService } from '@nestjs/axios';
 import { ConfigService } from '@nestjs/config';
 import { Test } from '@nestjs/testing';
 import { of } from 'rxjs';
-import {
-  MOCK_MANIFEST_URL,
-  mockConfig,
-} from '../../../test/constants';
+import { MOCK_MANIFEST_URL, mockConfig } from '../../../test/constants';
 import {
   AssignmentStatus,
   JobFieldName,
@@ -577,7 +574,7 @@ describe('JobService', () => {
     });
   });
 
-  describe('processInvalidJob', () => {
+  describe('processInvalidJobSolution', () => {
     it('should mark a job solution as invalid', async () => {
       const workerAddress = '0x1234567890123456789012345678901234567891';
       const solution = 'test';
@@ -591,6 +588,12 @@ describe('JobService', () => {
         .fn()
         .mockResolvedValue(existingJobSolutions);
       storageService.uploadJobSolutions = jest.fn();
+      assignmentRepository.findOneByEscrowAndWorker = jest
+        .fn()
+        .mockResolvedValue({
+          id: 1,
+          status: AssignmentStatus.VALIDATION,
+        });
 
       await jobService.processInvalidJobSolution({
         chainId,
@@ -610,6 +613,10 @@ describe('JobService', () => {
           },
         ],
       );
+      expect(assignmentRepository.updateOne).toHaveBeenCalledWith({
+        id: 1,
+        status: AssignmentStatus.REJECTED,
+      });
     });
 
     it('should throw an error if solution was not previously in S3', async () => {

packages/apps/fortune/exchange-oracle/server/src/modules/job/job.service.ts

@@ -250,6 +250,16 @@ export class JobService {
 
         if (foundSolution) {
           foundSolution.error = true;
+          const assignment =
+            await this.assignmentRepository.findOneByEscrowAndWorker(
+              invalidJobSolution.escrowAddress,
+              invalidJobSolution.chainId,
+              foundSolution.workerAddress,
+            );
+          if (assignment) {
+            assignment.status = AssignmentStatus.REJECTED;
+            this.assignmentRepository.updateOne(assignment);
+          }
         } else {
           throw new BadRequestException(
             `Solution not found in Escrow: ${invalidJobSolution.escrowAddress}`,

packages/apps/fortune/recording-oracle/src/modules/job/job.service.ts

@@ -55,40 +55,36 @@ export class JobService {
 
     filteredExchangeSolution.forEach((exchangeSolution) => {
       if (errorSolutions.includes(exchangeSolution)) return;
+      const duplicatedInUnique = uniqueSolutions.filter(
+        (solution) =>
+          solution.workerAddress === exchangeSolution.workerAddress ||
+          solution.solution === exchangeSolution.solution,
+      );
+      if (
+        duplicatedInUnique.length > 0 &&
+        !errorSolutions.includes(exchangeSolution)
+      ) {
+        errorSolutions.push({
+          ...exchangeSolution,
+          error: SolutionError.Duplicated,
+        });
+        return;
+      }
 
       const duplicatedInRecording = recordingSolutions.filter(
         (solution) =>
-          solution.workerAddress === exchangeSolution.workerAddress ||
+          solution.workerAddress === exchangeSolution.workerAddress &&
           solution.solution === exchangeSolution.solution,
       );
 
       if (duplicatedInRecording.length === 0) {
-        const duplicatedInExchange = filteredExchangeSolution.filter(
-          (solution) =>
-            solution.workerAddress === exchangeSolution.workerAddress ||
-            solution.solution === exchangeSolution.solution,
-        );
-        if (duplicatedInExchange.length > 1) {
-          duplicatedInExchange.forEach((duplicated) => {
-            if (
-              (duplicated.solution !== exchangeSolution.solution ||
-                duplicated.workerAddress !== exchangeSolution.workerAddress) &&
-              !errorSolutions.includes(duplicated)
-            ) {
-              errorSolutions.push({
-                ...duplicated,
-                error: SolutionError.Duplicated,
-              });
-            }
-          });
-        }
         if (checkCurseWords(exchangeSolution.solution))
           errorSolutions.push({
             ...exchangeSolution,
             error: SolutionError.CurseWord,
           });
         else uniqueSolutions.push(exchangeSolution);
-      }
+      } else uniqueSolutions.push(exchangeSolution);
     });
     return { errorSolutions, uniqueSolutions };
   }
@@ -161,7 +157,6 @@ export class JobService {
     );
 
     const recordingOracleSolutions: ISolution[] = [
-      ...existingJobSolutions,
       ...uniqueSolutions,
       ...errorSolutions,
     ];