Default processors

packages/apps/fortune/recording-oracle/src/common/interfaces/job.ts

@@ -11,9 +11,16 @@ export interface ISolution {
   workerAddress: string;
   solution: string;
   error?: boolean | SolutionError;
+  verificationResult?: VerificationResult;
+  rejectionReason?: SolutionError;
 }
 
 export interface ISolutionsFile {
   exchangeAddress: string;
   solutions: ISolution[];
 }
+
+export enum VerificationResult {
+  Accepted = 'accepted',
+  Rejected = 'rejected',
+}

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

@@ -16,7 +16,11 @@ import { ErrorJob } from '../../common/constants/errors';
 import { JobRequestType, SolutionError } from '../../common/enums/job';
 import { EventType } from '../../common/enums/webhook';
 import { ConflictError, ValidationError } from '../../common/errors';
-import { IManifest, ISolution } from '../../common/interfaces/job';
+import {
+  IManifest,
+  ISolution,
+  VerificationResult,
+} from '../../common/interfaces/job';
 import { checkCurseWords } from '../../common/utils/curseWords';
 import { sendWebhook } from '../../common/utils/webhook';
 import { StorageService } from '../storage/storage.service';
@@ -48,8 +52,8 @@ export class JobService {
     const errorSolutions: ISolution[] = [];
     const uniqueSolutions: ISolution[] = [];
 
-    const filteredExchangeSolution = exchangeSolutions.filter(
-      (exchangeSolution) => !exchangeSolution.error,
+    const filteredExchangeSolution = exchangeSolutions.filter((solution) =>
+      this.isAcceptedSolution(solution),
     );
 
     filteredExchangeSolution.forEach((exchangeSolution) => {
@@ -88,6 +92,30 @@ export class JobService {
     return { errorSolutions, uniqueSolutions };
   }
 
+  private isAcceptedSolution(solution: ISolution): boolean {
+    return (
+      !solution.error &&
+      solution.verificationResult !== VerificationResult.Rejected
+    );
+  }
+
+  private toFinalResult(solution: ISolution): ISolution {
+    const rejectionReason =
+      solution.error ||
+      solution.verificationResult === VerificationResult.Rejected
+        ? solution.rejectionReason || (solution.error as SolutionError)
+        : undefined;
+
+    return {
+      workerAddress: solution.workerAddress,
+      solution: solution.solution,
+      verificationResult: rejectionReason
+        ? VerificationResult.Rejected
+        : VerificationResult.Accepted,
+      ...(rejectionReason ? { rejectionReason } : {}),
+    };
+  }
+
   async processJobSolution(webhook: WebhookDto): Promise<string> {
     const logger = this.logger.child({
       action: 'processJobSolution',
@@ -149,7 +177,11 @@ export class JobService {
       );
     }
 
-    if (existingJobSolutions.length >= submissionsRequired) {
+    if (
+      existingJobSolutions.filter((solution) =>
+        this.isAcceptedSolution(solution),
+      ).length >= submissionsRequired
+    ) {
       logger.warn(ErrorJob.AllSolutionsHaveAlreadyBeenSent, {
         submissionsRequired,
         nExistingJobSolutions: existingJobSolutions.length,
@@ -175,7 +207,7 @@ export class JobService {
     const jobSolutionUploaded = await this.storageService.uploadJobSolutions(
       webhook.escrowAddress,
       webhook.chainId,
-      recordingOracleSolutions,
+      recordingOracleSolutions.map((solution) => this.toFinalResult(solution)),
     );
 
     const lastExchangeSolution =
@@ -206,8 +238,9 @@ export class JobService {
     );
 
     if (
-      recordingOracleSolutions.filter((solution) => !solution.error).length >=
-      submissionsRequired
+      recordingOracleSolutions.filter((solution) =>
+        this.isAcceptedSolution(solution),
+      ).length >= submissionsRequired
     ) {
       const reputationOracleWebhook = await KVStoreUtils.get(
         webhook.chainId,

packages/apps/job-launcher/client/src/pages/Job/JobDetail/index.tsx

@@ -248,11 +248,14 @@ export default function JobDetail() {
                   },
                   { id: 'solution', label: 'Fortune' },
                   {
-                    id: 'error',
+                    id: 'verificationResult',
                     label: 'Status',
-                    render: ({ error }) => (error ? 'Refused' : 'Accepted'),
+                    render: ({ verificationResult }) =>
+                      verificationResult === 'rejected'
+                        ? 'Rejected'
+                        : 'Accepted',
                   },
-                  { id: 'error', label: 'Refused reason' },
+                  { id: 'rejectionReason', label: 'Rejection reason' },
                 ]}
                 data={data}
                 page={page}

packages/apps/job-launcher/client/src/types/index.ts

@@ -290,9 +290,10 @@ export type JobDetailsResults = JobDetailsResponse & {
 };
 
 export type FortuneFinalResult = {
-  exchangeAddress: string;
   workerAddress: string;
   solution: string;
+  verificationResult: 'accepted' | 'rejected';
+  rejectionReason?: string;
 };
 
 export type Qualification = {

packages/apps/job-launcher/server/src/modules/job/job.dto.ts

@@ -228,10 +228,18 @@ export class FortuneFinalResultDto {
   @IsString()
   public solution: string;
 
-  @ApiProperty()
+  @ApiProperty({
+    name: 'verification_result',
+    enum: ['accepted', 'rejected'],
+  })
+  @IsNotEmpty()
+  @IsIn(['accepted', 'rejected'])
+  public verificationResult: string;
+
+  @ApiPropertyOptional({ name: 'rejection_reason' })
   @IsOptional()
   @IsString()
-  public error?: string;
+  public rejectionReason?: string;
 }
 
 export class JobListDto {

packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts

@@ -950,11 +950,13 @@ describe('JobService', () => {
         {
           workerAddress: faker.finance.ethereumAddress(),
           solution: 'good',
+          verificationResult: 'accepted',
         },
         {
           workerAddress: faker.finance.ethereumAddress(),
           solution: 'bad',
-          error: 'wrong answer',
+          verificationResult: 'rejected',
+          rejectionReason: 'wrong answer',
         },
       ];
 

packages/apps/reputation-oracle/server/src/common/types/job-result.ts

@@ -1,20 +1,21 @@
-export type FortuneFinalResult = {
-  workerAddress: string;
-  solution: string;
-  error?: 'duplicated' | 'curse_word';
-};
-
 export enum VerificationResult {
   Accepted = 'accepted',
   Rejected = 'rejected',
 }
 
-export type MarketingFinalResult = {
-  workerAddress: string;
-  postUrl: string;
-  verificationResult: VerificationResult;
+export class BaseFinalResult {
+  workerAddress!: string;
+  verificationResult!: VerificationResult;
   rejectionReason?: string;
-};
+}
+
+export class FortuneFinalResult extends BaseFinalResult {
+  solution!: string;
+}
+
+export class MarketingFinalResult extends BaseFinalResult {
+  postUrl!: string;
+}
 
 type CvatAnnotationMetaJob = {
   job_id: number;

packages/apps/reputation-oracle/server/src/common/types/manifest.ts

@@ -5,16 +5,18 @@ import {
   MarketingJobType,
 } from '@/common/enums';
 
-export type FortuneManifest = {
+export interface BaseManifest<
+  TJobType extends FortuneJobType | MarketingJobType,
+> {
   submissionsRequired: number;
-  requestType: FortuneJobType;
-};
+  jobType: TJobType;
+}
 
-export type MarketingManifest = {
-  job_type: MarketingJobType;
-  submissions_required: number;
-  end_date?: string;
-};
+export type FortuneManifest = BaseManifest<FortuneJobType>;
+
+export interface MarketingManifest extends BaseManifest<MarketingJobType> {
+  endDate?: string;
+}
 
 export type CvatManifest = {
   annotation: {