Remove RoutingProtocol module and service, update JobService to use Web3Service for oracle selection

Author: flopez7

packages/apps/job-launcher/server/src/common/config/env-schema.ts

@@ -30,7 +30,6 @@ export const envValidator = Joi.object({
   GAS_PRICE_MULTIPLIER: Joi.number(),
   APPROVE_AMOUNT_USD: Joi.number(),
   REPUTATION_ORACLE_ADDRESS: Joi.string().required(),
-  REPUTATION_ORACLES: Joi.string().required(),
   CVAT_EXCHANGE_ORACLE_ADDRESS: Joi.string().required(),
   CVAT_RECORDING_ORACLE_ADDRESS: Joi.string().required(),
   HCAPTCHA_ORACLE_ADDRESS: Joi.string().required(),

packages/apps/job-launcher/server/src/common/config/slack-config.service.ts

@@ -0,0 +1,17 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+@Injectable()
+export class SlackConfigService {
+  constructor(private configService: ConfigService) {}
+
+  /**
+   * The abuse notification webhook URL for sending messages to a Slack channel.
+   * Required
+   */
+  get abuseNotificationWebhookUrl(): string {
+    return this.configService.getOrThrow<string>(
+      'SLACK_ABUSE_NOTIFICATION_WEBHOOK_URL',
+    );
+  }
+}

packages/apps/job-launcher/server/src/common/config/vision-config.service.ts

@@ -0,0 +1,51 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+@Injectable()
+export class VisionConfigService {
+  constructor(private configService: ConfigService) {}
+
+  /**
+   * The Google Cloud Storage (GCS) path name where temporary async moderation results will be saved.
+   * Required
+   */
+  get moderationResultsFilesPath(): string {
+    return this.configService.getOrThrow<string>(
+      'GCV_MODERATION_RESULTS_FILES_PATH',
+    );
+  }
+
+  /**
+   * The Google Cloud Storage (GCS) bucket name where moderation results will be saved.
+   * Required
+   */
+  get moderationResultsBucket(): string {
+    return this.configService.getOrThrow<string>(
+      'GCV_MODERATION_RESULTS_BUCKET',
+    );
+  }
+
+  /**
+   * The project ID for connecting to the Google Cloud Vision API.
+   * Required
+   */
+  get projectId(): string {
+    return this.configService.getOrThrow<string>('GOOGLE_PROJECT_ID');
+  }
+
+  /**
+   * The private key for authenticating with the Google Cloud Vision API.
+   * Required
+   */
+  get privateKey(): string {
+    return this.configService.getOrThrow<string>('GOOGLE_PRIVATE_KEY');
+  }
+
+  /**
+   * The client email used for authenticating requests to the Google Cloud Vision API.
+   * Required
+   */
+  get clientEmail(): string {
+    return this.configService.getOrThrow<string>('GOOGLE_CLIENT_EMAIL');
+  }
+}

packages/apps/job-launcher/server/src/common/config/web3-config.service.ts

@@ -37,14 +37,6 @@ export class Web3ConfigService {
     return this.configService.getOrThrow<string>('REPUTATION_ORACLE_ADDRESS');
   }
 
-  /**
-   * List of reputation oracle addresses, typically comma-separated.
-   * Required
-   */
-  get reputationOracles(): string {
-    return this.configService.getOrThrow<string>('REPUTATION_ORACLES');
-  }
-
   /**
    * URI for the hCaptcha recording oracle service.
    * Required

packages/apps/job-launcher/server/src/common/constants/errors.ts

@@ -166,15 +166,6 @@ export enum ErrorWeb3 {
   ReputationOracleUrlNotSet = 'Reputation oracle URL not set',
 }
 
-/**
- * Represents error messages related to routing protocol.
- */
-export enum ErrorRoutingProtocol {
-  ReputationOracleNotFound = 'The specified Reputation Oracle address is not found in the set of available oracles. Ensure the address is correct and check available oracles for this network.',
-  ExchangeOracleNotFound = 'The specified Exchange Oracle address is not found in the set of available oracles. Ensure the address is correct and part of the available oracle pool.',
-  RecordingOracleNotFound = 'The specified Recording Oracle address is not found in the set of available oracles. Ensure the address is correct and part of the available oracle pool.',
-}
-
 /**
  * Represents error messages related to send grid.
  */

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

@@ -47,7 +47,6 @@ import { PaymentRepository } from '../payment/payment.repository';
 import { PaymentService } from '../payment/payment.service';
 import { QualificationService } from '../qualification/qualification.service';
 import { RateService } from '../rate/rate.service';
-import { RoutingProtocolService } from '../routing-protocol/routing-protocol.service';
 import { StorageService } from '../storage/storage.service';
 import { Web3Service } from '../web3/web3.service';
 import { WebhookEntity } from '../webhook/webhook.entity';
@@ -124,10 +123,6 @@ describe('CronJobService', () => {
         { provide: PaymentService, useValue: createMock<PaymentService>() },
         { provide: WhitelistService, useValue: createMock<WhitelistService>() },
         { provide: ConfigService, useValue: mockConfigService },
-        {
-          provide: RoutingProtocolService,
-          useValue: createMock<RoutingProtocolService>(),
-        },
         {
           provide: WebhookRepository,
           useValue: createMock<WebhookRepository>(),

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

@@ -1,3 +1,4 @@
+import { ChainId } from '@human-protocol/sdk';
 import { Test, TestingModule } from '@nestjs/testing';
 import { JobController } from './job.controller';
 import { JobService } from './job.service';
@@ -84,6 +85,7 @@ describe('JobController', () => {
   describe('quickLaunch', () => {
     it('should create a job and return job ID', async () => {
       const jobDto: JobQuickLaunchDto = {
+        chainId: ChainId.POLYGON_AMOY,
         requestType: 'type_a' as JobRequestType,
         manifestUrl: MOCK_FILE_URL,
         manifestHash: MOCK_FILE_HASH,
@@ -119,6 +121,7 @@ describe('JobController', () => {
 
     it('should throw a conflict error if mutex manager fails', async () => {
       const jobDto: JobQuickLaunchDto = {
+        chainId: ChainId.POLYGON_AMOY,
         requestType: 'type_a' as JobRequestType,
         manifestUrl: MOCK_FILE_URL,
         manifestHash: MOCK_FILE_HASH,
@@ -159,6 +162,7 @@ describe('JobController', () => {
 
     it('should return unauthorized error if user is not authenticated', async () => {
       const jobDto: JobQuickLaunchDto = {
+        chainId: ChainId.POLYGON_AMOY,
         requestType: 'type_a' as JobRequestType,
         manifestUrl: MOCK_FILE_URL,
         manifestHash: MOCK_FILE_HASH,
@@ -185,6 +189,7 @@ describe('JobController', () => {
 
   describe('createFortuneJob', () => {
     const jobFortuneDto: JobFortuneDto = {
+      chainId: ChainId.POLYGON_AMOY,
       requesterTitle: MOCK_REQUESTER_TITLE,
       requesterDescription: MOCK_REQUESTER_DESCRIPTION,
       submissionsRequired: 10,

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

@@ -0,0 +1,36 @@
+import { ChainId } from '@human-protocol/sdk';
+import { validate } from 'class-validator';
+import { EscrowFundToken, FortuneJobType } from '../../common/enums/job';
+import { PaymentCurrency } from '../../common/enums/payment';
+import { JobFortuneDto, JobQuickLaunchDto } from './job.dto';
+
+describe('JobDto validation', () => {
+  it('should require chainId for quick launch job creation', async () => {
+    const dto = new JobQuickLaunchDto();
+    dto.requestType = FortuneJobType.FORTUNE;
+    dto.manifestUrl = 'https://example.com/manifest.json';
+    dto.manifestHash = 'manifest.json';
+    dto.paymentCurrency = PaymentCurrency.USD;
+    dto.paymentAmount = 10;
+    dto.escrowFundToken = EscrowFundToken.USDC;
+
+    const errors = await validate(dto);
+
+    expect(errors.some((error) => error.property === 'chainId')).toBe(true);
+  });
+
+  it('should accept chainId for fortune job creation', async () => {
+    const dto = new JobFortuneDto();
+    dto.chainId = ChainId.POLYGON_AMOY;
+    dto.requesterTitle = 'Title';
+    dto.requesterDescription = 'Description';
+    dto.submissionsRequired = 5;
+    dto.paymentCurrency = PaymentCurrency.USD;
+    dto.paymentAmount = 10;
+    dto.escrowFundToken = EscrowFundToken.USDC;
+
+    const errors = await validate(dto);
+
+    expect(errors.some((error) => error.property === 'chainId')).toBe(false);
+  });
+});

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

@@ -32,10 +32,9 @@ import { IsValidToken } from '../../common/validators/tokens';
 import { ManifestDetails } from '../manifest/manifest.dto';
 
 export class JobDto {
-  @ApiProperty({ enum: ChainId, required: false, name: 'chain_id' })
+  @ApiProperty({ enum: ChainId, name: 'chain_id' })
   @IsEnumCaseInsensitive(ChainId)
-  @IsOptional()
-  public chainId?: ChainId;
+  public chainId: ChainId;
 
   @ApiPropertyOptional()
   @IsArray()

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

@@ -15,7 +15,6 @@ import { WebhookRepository } from '../webhook/webhook.repository';
 import { MutexManagerService } from '../mutex/mutex-manager.service';
 import { QualificationModule } from '../qualification/qualification.module';
 import { WhitelistModule } from '../whitelist/whitelist.module';
-import { RoutingProtocolModule } from '../routing-protocol/routing-protocol.module';
 import { RateModule } from '../rate/rate.module';
 import { ManifestModule } from '../manifest/manifest.module';
 
@@ -29,7 +28,6 @@ import { ManifestModule } from '../manifest/manifest.module';
     StorageModule,
     QualificationModule,
     WhitelistModule,
-    RoutingProtocolModule,
     RateModule,
     ManifestModule,
   ],