Merge branch 'develop' into contracts-v2

Author: portuu3

docker-setup/docker-compose.dev.yml

@@ -73,7 +73,7 @@ services:
 
   graph-node-db:
     container_name: hp-dev-graph-node-db
-    image: postgres:latest
+    image: postgres:16
     restart: *default-restart
     logging:
       <<: *default-logging

packages/apps/fortune/exchange-oracle/server/src/common/enums/job.ts

@@ -1,6 +1,5 @@
 export enum JobStatus {
   ACTIVE = 'active',
-  PAUSED = 'paused',
   COMPLETED = 'completed',
   CANCELED = 'canceled',
 }

packages/apps/fortune/exchange-oracle/server/src/common/enums/webhook.ts

@@ -6,7 +6,6 @@ export enum EventType {
   SUBMISSION_REJECTED = 'submission_rejected',
   SUBMISSION_IN_REVIEW = 'submission_in_review',
   ABUSE_DETECTED = 'abuse_detected',
-  ABUSE_DISMISSED = 'abuse_dismissed',
   CANCELLATION_REQUESTED = 'cancellation_requested',
 }
 

packages/apps/fortune/exchange-oracle/server/src/database/migrations/1762175785287-removePausedStatus.ts

@@ -0,0 +1,39 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemovePausedStatus1762175785287 implements MigrationInterface {
+  name = 'RemovePausedStatus1762175785287';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    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('active', 'completed', '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"
+        `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            CREATE TYPE "hmt"."jobs_status_enum_old" AS ENUM('active', 'paused', 'completed', 'canceled')
+        `);
+    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"
+        `);
+  }
+}

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

@@ -229,7 +229,7 @@ describe('AssignmentService', () => {
           id: 1,
           manifestUrl: MOCK_MANIFEST_URL,
           reputationNetwork: reputationNetwork,
-          status: JobStatus.PAUSED,
+          status: JobStatus.CANCELED,
         } as any);
 
       await expect(

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

@@ -667,54 +667,4 @@ describe('JobService', () => {
       ).rejects.toThrow(`Solution not found in Escrow: ${escrowAddress}`);
     });
   });
-
-  describe('pauseJob', () => {
-    const webhook: WebhookDto = {
-      chainId,
-      escrowAddress,
-      eventType: EventType.ABUSE_DETECTED,
-    };
-
-    it('should create a new job in the database', async () => {
-      jest
-        .spyOn(jobRepository, 'findOneByChainIdAndEscrowAddress')
-        .mockResolvedValue({
-          chainId: chainId,
-          escrowAddress: escrowAddress,
-          status: JobStatus.ACTIVE,
-        } as JobEntity);
-      const result = await jobService.pauseJob(webhook);
-
-      expect(result).toEqual(undefined);
-      expect(jobRepository.updateOne).toHaveBeenCalledWith({
-        chainId: chainId,
-        escrowAddress: escrowAddress,
-        status: JobStatus.PAUSED,
-      });
-    });
-
-    it('should fail if job not exists', async () => {
-      jest
-        .spyOn(jobRepository, 'findOneByChainIdAndEscrowAddress')
-        .mockResolvedValue(null);
-
-      await expect(jobService.pauseJob(webhook)).rejects.toThrow(
-        ErrorJob.NotFound,
-      );
-    });
-
-    it('should fail if job is not in Active status', async () => {
-      jest
-        .spyOn(jobRepository, 'findOneByChainIdAndEscrowAddress')
-        .mockResolvedValue({
-          chainId: chainId,
-          escrowAddress: escrowAddress,
-          status: JobStatus.CANCELED,
-        } as JobEntity);
-
-      await expect(jobService.pauseJob(webhook)).rejects.toThrow(
-        ErrorJob.InvalidStatus,
-      );
-    });
-  });
 });

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

@@ -382,34 +382,4 @@ export class JobService {
 
     return manifest;
   }
-
-  public async pauseJob(webhook: WebhookDto): Promise<void> {
-    const jobEntity = await this.jobRepository.findOneByChainIdAndEscrowAddress(
-      webhook.chainId,
-      webhook.escrowAddress,
-    );
-    if (!jobEntity) {
-      throw new ServerError(ErrorJob.NotFound);
-    }
-    if (jobEntity.status !== JobStatus.ACTIVE) {
-      throw new ConflictError(ErrorJob.InvalidStatus);
-    }
-    jobEntity.status = JobStatus.PAUSED;
-    await this.jobRepository.updateOne(jobEntity);
-  }
-
-  public async resumeJob(webhook: WebhookDto): Promise<void> {
-    const jobEntity = await this.jobRepository.findOneByChainIdAndEscrowAddress(
-      webhook.chainId,
-      webhook.escrowAddress,
-    );
-    if (!jobEntity) {
-      throw new ServerError(ErrorJob.NotFound);
-    }
-    if (jobEntity.status !== JobStatus.PAUSED) {
-      throw new ConflictError(ErrorJob.InvalidStatus);
-    }
-    jobEntity.status = JobStatus.ACTIVE;
-    await this.jobRepository.updateOne(jobEntity);
-  }
 }

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

@@ -169,7 +169,7 @@ describe('WebhookService', () => {
     });
 
     it('should handle an incoming escrow abuse webhook', async () => {
-      jest.spyOn(jobService, 'pauseJob').mockResolvedValue();
+      jest.spyOn(jobService, 'cancelJob').mockResolvedValue();
       const webhook: WebhookDto = {
         chainId,
         escrowAddress,
@@ -178,16 +178,6 @@ describe('WebhookService', () => {
       expect(await webhookService.handleWebhook(webhook)).toBe(undefined);
     });
 
-    it('should handle an incoming escrow resume webhook', async () => {
-      jest.spyOn(jobService, 'resumeJob').mockResolvedValue();
-      const webhook: WebhookDto = {
-        chainId,
-        escrowAddress,
-        eventType: EventType.ABUSE_DISMISSED,
-      };
-      expect(await webhookService.handleWebhook(webhook)).toBe(undefined);
-    });
-
     it('should return an error when the event type is invalid', async () => {
       const webhook: WebhookDto = {
         chainId,

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

@@ -54,11 +54,7 @@ export class WebhookService {
         break;
 
       case EventType.ABUSE_DETECTED:
-        await this.jobService.pauseJob(webhook);
-        break;
-
-      case EventType.ABUSE_DISMISSED:
-        await this.jobService.resumeJob(webhook);
+        await this.jobService.cancelJob(webhook);
         break;
 
       case EventType.ESCROW_CANCELED:

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

@@ -119,6 +119,7 @@ export class JobService {
     // DISABLE HMT
     if (
       requestType !== HCaptchaJobType.HCAPTCHA &&
+      dto.chainId !== ChainId.LOCALHOST &&
       (dto.escrowFundToken === EscrowFundToken.HMT ||
         dto.paymentCurrency === PaymentCurrency.HMT)
     ) {