fix: chain id usage on jl

Author: dnechay

packages/apps/job-launcher/server/src/common/guards/jwt.auth.ts

@@ -6,11 +6,14 @@ import {
 } from '@nestjs/common';
 import { ModuleRef, Reflector } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
+import logger from '../../logger';
 import { AuthError, ForbiddenError } from '../errors';
 import { ApiKeyGuard } from './apikey.auth';
 
 @Injectable()
 export class JwtAuthGuard extends AuthGuard('jwt-http') implements CanActivate {
+  private readonly logger = logger.child({ context: JwtAuthGuard.name });
+
   constructor(
     private readonly reflector: Reflector,
     private readonly moduleRef: ModuleRef,
@@ -29,7 +32,9 @@ export class JwtAuthGuard extends AuthGuard('jwt-http') implements CanActivate {
       try {
         return apiKeyGuard.canActivate(context);
       } catch (apiKeyError) {
-        console.error('API key auth failed:', apiKeyError);
+        this.logger.error('API key auth failed', {
+          error: apiKeyError,
+        });
       }
     }
 

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

@@ -468,12 +468,15 @@ export class CronJobService {
         await this.cronJobRepository.save(cronJob);
       }
     } catch (error) {
-      this.logger.error('Error in syncJobStatuses cron job', error);
+      this.logger.error('Error in syncJobStatuses cron job', {
+        error,
+      });
     }
 
     this.logger.debug('Update jobs STOP');
     await this.completeCronJob(cronJob);
   }
+
   private async createCancellationWebhooks(
     jobEntity: JobEntity,
     oracleType: OracleType,

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

@@ -8,6 +8,7 @@ import {
   AvailableOraclesDto,
   GetAvailableOraclesDto,
   GetReputationOraclesDto,
+  validChainIds,
 } from './web3.dto';
 
 @ApiTags('Web3')
@@ -29,9 +30,7 @@ export class Web3Controller {
       type: 'array',
       items: {
         type: 'number',
-        enum: Object.values(ChainId).filter(
-          (value) => typeof value === 'number' && value > 0,
-        ) as number[],
+        enum: validChainIds,
       },
     },
   })

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

@@ -1,6 +1,8 @@
 import { ChainId, IOperator } from '@human-protocol/sdk';
+import { applyDecorators } from '@nestjs/common';
 import { ApiProperty } from '@nestjs/swagger';
-import { IsString } from 'class-validator';
+import { Transform } from 'class-transformer';
+import { IsIn, IsString } from 'class-validator';
 
 export class OracleDataDto implements Partial<IOperator> {
   address: string;
@@ -9,6 +11,17 @@ export class OracleDataDto implements Partial<IOperator> {
   jobTypes?: string[] | null;
 }
 
+export const validChainIds = Object.values(ChainId).filter(
+  (value) => typeof value === 'number' && value > 0,
+) as number[];
+
+function IsValidChainId() {
+  return applyDecorators(
+    IsIn(validChainIds),
+    Transform(({ value }) => Number(value)),
+  );
+}
+
 export class AvailableOraclesDto {
   @ApiProperty({
     description: 'List of addresses of exchange oracles',
@@ -22,8 +35,8 @@ export class AvailableOraclesDto {
 }
 
 export class GetAvailableOraclesDto {
-  @ApiProperty({ name: 'chain_id' })
-  @IsString()
+  @ApiProperty({ name: 'chain_id', enum: validChainIds })
+  @IsValidChainId()
   chainId: ChainId;
 
   @ApiProperty({ name: 'job_type' })
@@ -36,8 +49,8 @@ export class GetAvailableOraclesDto {
 }
 
 export class GetReputationOraclesDto {
-  @ApiProperty({ name: 'chain_id' })
-  @IsString()
+  @ApiProperty({ name: 'chain_id', enum: validChainIds })
+  @IsValidChainId()
   chainId: ChainId;
 
   @ApiProperty({ name: 'job_type' })