remove duplicated workflow_dispatch trigger from CD workflows for package publishing

flopez7 · flopez7 · commit cc3a188ce021 · 2025-11-20T14:56:51.000+01:00
diff --git a/packages/apps/job-launcher/server/src/common/config/env-schema.ts b/packages/apps/job-launcher/server/src/common/config/env-schema.ts
@@ -27,7 +27,7 @@ export const envValidator = Joi.object({
   WEB3_ENV: Joi.string(),
   WEB3_PRIVATE_KEY: Joi.string().required(),
   GAS_PRICE_MULTIPLIER: Joi.number(),
-  APPROVE_AMOUNT: 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(),
diff --git a/packages/apps/job-launcher/server/src/common/config/web3-config.service.ts b/packages/apps/job-launcher/server/src/common/config/web3-config.service.ts
@@ -111,7 +111,7 @@ export class Web3ConfigService {
     );
   }
 
-  get approveAmount(): number {
-    return this.configService.get<number>('APPROVE_AMOUNT', 100);
+  get approveAmountUsd(): number {
+    return this.configService.get<number>('APPROVE_AMOUNT_USD', 100);
   }
 }
diff --git a/packages/apps/job-launcher/server/src/common/constants/tokens.ts b/packages/apps/job-launcher/server/src/common/constants/tokens.ts
@@ -11,44 +11,53 @@ export const TOKEN_ADDRESSES: {
     [EscrowFundToken.HMT]: {
       address: NETWORKS[ChainId.MAINNET]!.hmtAddress,
       decimals: 18,
+      symbol: EscrowFundToken.HMT,
     },
     [EscrowFundToken.USDT]: {
       address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
       decimals: 6,
+      symbol: EscrowFundToken.USDT,
     },
     [EscrowFundToken.USDC]: {
       address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
       decimals: 6,
+      symbol: EscrowFundToken.USDC,
     },
   },
   [ChainId.SEPOLIA]: {
     [EscrowFundToken.HMT]: {
       address: NETWORKS[ChainId.SEPOLIA]!.hmtAddress,
       decimals: 18,
+      symbol: EscrowFundToken.HMT,
     },
     [EscrowFundToken.USDT]: {
       address: '0xaA8E23Fb1079EA71e0a56F48a2aA51851D8433D0',
       decimals: 6,
+      symbol: EscrowFundToken.USDT,
     },
     [EscrowFundToken.USDC]: {
       address: '0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238',
       decimals: 6,
+      symbol: EscrowFundToken.USDC,
     },
   },
   [ChainId.BSC_MAINNET]: {
     [EscrowFundToken.HMT]: {
       address: NETWORKS[ChainId.BSC_MAINNET]!.hmtAddress,
       decimals: 18,
+      symbol: EscrowFundToken.HMT,
     },
   },
   [ChainId.POLYGON]: {
     [EscrowFundToken.HMT]: {
       address: NETWORKS[ChainId.POLYGON]!.hmtAddress,
       decimals: 18,
+      symbol: EscrowFundToken.HMT,
     },
     [EscrowFundToken.USDT0]: {
       address: '0xc2132D05D31c914a87C6611C10748AEb04B58e8F',
       decimals: 6,
+      symbol: EscrowFundToken.USDT0,
     },
     // Disabled
     // [EscrowFundToken.USDC]: {
@@ -60,22 +69,26 @@ export const TOKEN_ADDRESSES: {
     [EscrowFundToken.HMT]: {
       address: NETWORKS[ChainId.POLYGON_AMOY]!.hmtAddress,
       decimals: 18,
+      symbol: EscrowFundToken.HMT,
     },
     [EscrowFundToken.USDC]: {
       address: '0x41e94eb019c0762f9bfcf9fb1e58725bfb0e7582',
       decimals: 6,
+      symbol: EscrowFundToken.USDC,
     },
   },
   [ChainId.LOCALHOST]: {
     [EscrowFundToken.HMT]: {
       address: NETWORKS[ChainId.LOCALHOST]!.hmtAddress,
       decimals: 18,
+      symbol: EscrowFundToken.HMT,
     },
   },
   [ChainId.BSC_TESTNET]: {
     [EscrowFundToken.HMT]: {
       address: NETWORKS[ChainId.BSC_TESTNET]!.hmtAddress,
       decimals: 18,
+      symbol: EscrowFundToken.HMT,
     },
   },
 };
diff --git a/packages/apps/job-launcher/server/src/common/enums/cron-job.ts b/packages/apps/job-launcher/server/src/common/enums/cron-job.ts
@@ -1,8 +1,6 @@
 export enum CronJobType {
   ContentModeration = 'content-moderation',
   CreateEscrow = 'create-escrow',
-  SetupEscrow = 'setup-escrow',
-  FundEscrow = 'fund-escrow',
   CancelEscrow = 'cancel-escrow',
   ProcessPendingWebhook = 'process-pending-webhook',
   SyncJobStatuses = 'sync-job-statuses',
diff --git a/packages/apps/job-launcher/server/src/common/interfaces/web3.ts b/packages/apps/job-launcher/server/src/common/interfaces/web3.ts
@@ -1,4 +1,7 @@
+import { EscrowFundToken } from '../enums/job';
+
 export interface IERC20Token {
   address: string;
   decimals: number;
+  symbol: EscrowFundToken;
 }
diff --git a/packages/apps/job-launcher/server/src/database/migrations/1762941180729-removeUnusedEscrowStatuses.ts b/packages/apps/job-launcher/server/src/database/migrations/1762941180729-removeUnusedEscrowStatuses.ts
diff --git a/packages/apps/job-launcher/server/src/database/migrations/1763628908882-removeUnusedTypes.ts b/packages/apps/job-launcher/server/src/database/migrations/1763628908882-removeUnusedTypes.ts
@@ -0,0 +1,113 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveUnusedTypes1763628908882 implements MigrationInterface {
+  name = 'RemoveUnusedTypes1763628908882';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            DELETE FROM "hmt"."cron-jobs"
+            WHERE "cron_job_type" IN ('setup-escrow', 'fund-escrow')
+        `);
+    await queryRunner.query(`
+            ALTER TYPE "hmt"."jobs_status_enum"
+            RENAME TO "jobs_status_enum_old"
+        `);
+    await queryRunner.query(`
+            CREATE TYPE "hmt"."jobs_status_enum" AS ENUM(
+                'paid',
+                'under_moderation',
+                'moderation_passed',
+                'possible_abuse_in_review',
+                'launched',
+                'partial',
+                'completed',
+                'failed',
+                'to_cancel',
+                'canceling',
+                'canceled'
+            )
+        `);
+    await queryRunner.query(`
+            ALTER TABLE "hmt"."jobs"
+            ALTER COLUMN "status" TYPE "hmt"."jobs_status_enum" USING "status"::"text"::"hmt"."jobs_status_enum"
+        `);
+    await queryRunner.query(`
+            DROP TYPE "hmt"."jobs_status_enum_old"
+        `);
+    await queryRunner.query(`
+            ALTER TYPE "hmt"."cron-jobs_cron_job_type_enum"
+            RENAME TO "cron-jobs_cron_job_type_enum_old"
+        `);
+    await queryRunner.query(`
+            CREATE TYPE "hmt"."cron-jobs_cron_job_type_enum" AS ENUM(
+                'content-moderation',
+                'create-escrow',
+                'cancel-escrow',
+                'process-pending-webhook',
+                'sync-job-statuses',
+                'abuse'
+            )
+        `);
+    await queryRunner.query(`
+            ALTER TABLE "hmt"."cron-jobs"
+            ALTER COLUMN "cron_job_type" TYPE "hmt"."cron-jobs_cron_job_type_enum" USING "cron_job_type"::"text"::"hmt"."cron-jobs_cron_job_type_enum"
+        `);
+    await queryRunner.query(`
+            DROP TYPE "hmt"."cron-jobs_cron_job_type_enum_old"
+        `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            CREATE TYPE "hmt"."cron-jobs_cron_job_type_enum_old" AS ENUM(
+                'abuse',
+                'cancel-escrow',
+                'content-moderation',
+                'create-escrow',
+                'fund-escrow',
+                'process-pending-webhook',
+                'setup-escrow',
+                'sync-job-statuses'
+            )
+        `);
+    await queryRunner.query(`
+            ALTER TABLE "hmt"."cron-jobs"
+            ALTER COLUMN "cron_job_type" TYPE "hmt"."cron-jobs_cron_job_type_enum_old" USING "cron_job_type"::"text"::"hmt"."cron-jobs_cron_job_type_enum_old"
+        `);
+    await queryRunner.query(`
+            DROP TYPE "hmt"."cron-jobs_cron_job_type_enum"
+        `);
+    await queryRunner.query(`
+            ALTER TYPE "hmt"."cron-jobs_cron_job_type_enum_old"
+            RENAME TO "cron-jobs_cron_job_type_enum"
+        `);
+    await queryRunner.query(`
+            CREATE TYPE "hmt"."jobs_status_enum_old" AS ENUM(
+                'canceled',
+                'canceling',
+                'completed',
+                'created',
+                'failed',
+                'funded',
+                'launched',
+                'moderation_passed',
+                'paid',
+                'partial',
+                'possible_abuse_in_review',
+                'to_cancel',
+                'under_moderation'
+            )
+        `);
+    await queryRunner.query(`
+            ALTER TABLE "hmt"."jobs"
+            ALTER COLUMN "status" TYPE "hmt"."jobs_status_enum_old" USING "status"::"text"::"hmt"."jobs_status_enum_old"
+        `);
+    await queryRunner.query(`
+            DROP TYPE "hmt"."jobs_status_enum"
+        `);
+    await queryRunner.query(`
+            ALTER TYPE "hmt"."jobs_status_enum_old"
+            RENAME TO "jobs_status_enum"
+        `);
+  }
+}
diff --git a/packages/apps/job-launcher/server/src/modules/qualification/qualification.service.spec.ts b/packages/apps/job-launcher/server/src/modules/qualification/qualification.service.spec.ts
@@ -21,6 +21,10 @@ import { ErrorQualification, ErrorWeb3 } from '../../common/constants/errors';
 import { ServerError, ValidationError } from '../../common/errors';
 import { Web3Service } from '../web3/web3.service';
 import { QualificationService } from './qualification.service';
+import { RateService } from '../rate/rate.service';
+import { createMock } from '@golevelup/ts-jest';
+
+const mockRateService = createMock<RateService>();
 
 describe.only('QualificationService', () => {
   let qualificationService: QualificationService, httpService: HttpService;
@@ -50,6 +54,10 @@ describe.only('QualificationService', () => {
             get: jest.fn(),
           },
         },
+        {
+          provide: RateService,
+          useValue: mockRateService,
+        },
       ],
     })
       .overrideProvider(NetworkConfigService)
diff --git a/packages/apps/job-launcher/server/src/modules/web3/web3.module.ts b/packages/apps/job-launcher/server/src/modules/web3/web3.module.ts
@@ -2,9 +2,10 @@ import { Module } from '@nestjs/common';
 import { Web3Service } from './web3.service';
 import { ConfigModule } from '@nestjs/config';
 import { Web3Controller } from './web3.controller';
+import { RateModule } from '../rate/rate.module';
 
 @Module({
-  imports: [ConfigModule],
+  imports: [ConfigModule, RateModule],
   providers: [Web3Service],
   exports: [Web3Service],
   controllers: [Web3Controller],
diff --git a/packages/apps/job-launcher/server/src/modules/web3/web3.service.spec.ts b/packages/apps/job-launcher/server/src/modules/web3/web3.service.spec.ts
diff --git a/packages/apps/job-launcher/server/src/modules/web3/web3.service.ts b/packages/apps/job-launcher/server/src/modules/web3/web3.service.ts

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ export class Web3ConfigService {`
`111`	`111`	`);`
`112`	`112`	`}`
`113`	`113`
`114`		`- get approveAmount(): number {`
`115`		`- return this.configService.get<number>('APPROVE_AMOUNT', 100);`
	`114`	`+ get approveAmountUsd(): number {`
	`115`	`+ return this.configService.get<number>('APPROVE_AMOUNT_USD', 100);`
`116`	`116`	`}`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
	`1`	`+import { EscrowFundToken } from '../enums/job';`
	`2`	`+`
`1`	`3`	`export interface IERC20Token {`
`2`	`4`	`address: string;`
`3`	`5`	`decimals: number;`
	`6`	`+ symbol: EscrowFundToken;`
`4`	`7`	`}`