Remove temporal fix for cancelation refunds (#3731)

Author: portuu3

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

@@ -1660,62 +1660,17 @@ describe('JobService', () => {
       expect(mockJobRepository.updateOne).toHaveBeenCalledWith(jobEntity);
     });
 
-    it('should not create a refund and set status to CANCELED when no refund is found', async () => {
+    it('should throw ConflictError when no refund is found', async () => {
       const jobEntity = createJobEntity();
       mockPaymentService.getJobPayments.mockResolvedValueOnce([]);
       mockedEscrowUtils.getCancellationRefund.mockResolvedValueOnce(
         null as any,
       );
 
-      jest
-        .spyOn(jobService as any, 'getRefundAmount')
-        .mockResolvedValueOnce(0n);
-
-      mockJobRepository.updateOne.mockResolvedValueOnce(jobEntity);
-
-      await jobService.cancelJob(jobEntity);
-
-      expect(mockPaymentService.getJobPayments).toHaveBeenCalledWith(
-        jobEntity.id,
-        PaymentType.SLASH,
-      );
-      expect(EscrowUtils.getCancellationRefund).toHaveBeenCalledWith(
-        jobEntity.chainId,
-        jobEntity.escrowAddress,
-      );
-      expect(mockPaymentService.createRefundPayment).not.toHaveBeenCalled();
-      expect(jobEntity.status).toBe(JobStatus.CANCELED);
-      expect(mockJobRepository.updateOne).toHaveBeenCalledWith(jobEntity);
-    });
-
-    it('should create a refund when on-chain refund amount is greater than 0', async () => {
-      const jobEntity = createJobEntity();
-      const tokenDecimals = (TOKEN_ADDRESSES[jobEntity.chainId as ChainId] ??
-        {})[jobEntity.token as EscrowFundToken]?.decimals;
-
-      mockPaymentService.getJobPayments.mockResolvedValueOnce([]);
-      mockedEscrowUtils.getCancellationRefund.mockResolvedValueOnce(
-        null as any,
+      await expect(jobService.cancelJob(jobEntity)).rejects.toThrow(
+        new ConflictError(ErrorJob.NoRefundFound),
       );
 
-      const refundAmount = faker.number.float({
-        min: 1,
-        max: 10,
-        fractionDigits: tokenDecimals,
-      });
-
-      // Mock on-chain refund lookup to return a positive amount
-      jest
-        .spyOn(jobService as any, 'getRefundAmount')
-        .mockResolvedValueOnce(
-          ethers.parseUnits(refundAmount.toString(), tokenDecimals),
-        );
-
-      mockPaymentService.createRefundPayment.mockResolvedValueOnce(undefined);
-      mockJobRepository.updateOne.mockResolvedValueOnce(jobEntity);
-
-      await jobService.cancelJob(jobEntity);
-
       expect(mockPaymentService.getJobPayments).toHaveBeenCalledWith(
         jobEntity.id,
         PaymentType.SLASH,
@@ -1724,14 +1679,8 @@ describe('JobService', () => {
         jobEntity.chainId,
         jobEntity.escrowAddress,
       );
-      expect(mockPaymentService.createRefundPayment).toHaveBeenCalledWith({
-        refundAmount: refundAmount,
-        refundCurrency: jobEntity.token,
-        userId: jobEntity.userId,
-        jobId: jobEntity.id,
-      });
-      expect(jobEntity.status).toBe(JobStatus.CANCELED);
-      expect(mockJobRepository.updateOne).toHaveBeenCalledWith(jobEntity);
+      expect(mockPaymentService.createRefundPayment).not.toHaveBeenCalled();
+      expect(mockJobRepository.updateOne).not.toHaveBeenCalled();
     });
 
     it('should throw ConflictError if refund.amount is empty', async () => {

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

@@ -1,10 +1,8 @@
-import { Escrow, Escrow__factory } from '@human-protocol/core/typechain-types';
 import {
   ChainId,
   EscrowClient,
   EscrowStatus,
   EscrowUtils,
-  ICancellationRefund,
   KVStoreKeys,
   KVStoreUtils,
   NETWORKS,
@@ -863,35 +861,20 @@ export class JobService {
       PaymentType.SLASH,
     );
     if (!slash?.length) {
-      let refund: ICancellationRefund | null = null;
-      try {
-        refund = await EscrowUtils.getCancellationRefund(
-          jobEntity.chainId,
-          jobEntity.escrowAddress!,
-        );
-      } catch {
-        // Ignore error
-      }
-
-      let amount = 0n;
+      const refund = await EscrowUtils.getCancellationRefund(
+        jobEntity.chainId,
+        jobEntity.escrowAddress!,
+      );
 
-      if (!refund) {
-        //Temp fix
-        amount = await this.getRefundAmount(
-          jobEntity.chainId,
-          jobEntity.escrowAddress!,
-          token.address,
-        );
-      } else {
-        if (!refund.amount) {
-          throw new ConflictError(ErrorJob.NoRefundFound);
-        }
-        amount = refund.amount;
+      if (!refund || !refund.amount) {
+        throw new ConflictError(ErrorJob.NoRefundFound);
       }
 
-      if (amount > 0n) {
+      if (refund.amount > 0n) {
         await this.paymentService.createRefundPayment({
-          refundAmount: Number(ethers.formatUnits(amount, token.decimals)),
+          refundAmount: Number(
+            ethers.formatUnits(refund.amount, token.decimals),
+          ),
           refundCurrency: jobEntity.token,
           userId: jobEntity.userId,
           jobId: jobEntity.id,
@@ -902,56 +885,4 @@ export class JobService {
     jobEntity.status = JobStatus.CANCELED;
     await this.jobRepository.updateOne(jobEntity);
   }
-
-  public async getRefundAmount(
-    chainId: ChainId,
-    escrowAddress: string,
-    tokenAddress: string,
-  ): Promise<bigint> {
-    const signer = this.web3Service.getSigner(chainId);
-    const provider = signer.provider!;
-    const contract: Escrow = Escrow__factory.connect(escrowAddress!, provider);
-    const fromBlock = 79278120; //This issue started at this block
-    const toBlock = 'latest';
-    const cancelledFilter = contract.filters?.Cancelled?.();
-    const cancelledLogs = await contract.queryFilter(
-      cancelledFilter,
-      fromBlock,
-      toBlock,
-    );
-
-    for (const log of cancelledLogs) {
-      const erc20Interface = new ethers.Interface([
-        'event Transfer(address indexed from, address indexed to, uint256 value)',
-      ]);
-
-      const transferTopic = erc20Interface.getEvent('Transfer')!.topicHash;
-      const receipt = await provider.getTransactionReceipt(log.transactionHash);
-
-      const transferLogs = receipt!.logs.filter(
-        (l) =>
-          l.address.toLowerCase() === tokenAddress.toLowerCase() &&
-          l.topics[0] === transferTopic,
-      );
-      for (const tlog of transferLogs) {
-        const decoded = erc20Interface.decodeEventLog(
-          'Transfer',
-          tlog.data,
-          tlog.topics,
-        );
-
-        const from = decoded.from as string;
-        const to = decoded.to as string;
-        const value = decoded.value as bigint;
-        if (
-          from.toLowerCase() === escrowAddress.toLowerCase() &&
-          to.toLowerCase() === (await signer.getAddress()).toLowerCase()
-        ) {
-          return value;
-        }
-      }
-    }
-
-    return 0n;
-  }
 }