Refactor job creation logic to remove fortune fundAmount from JL client and add it into JL server

Author: flopez7

packages/apps/job-launcher/client/src/components/Jobs/Create/CryptoPayForm.tsx

@@ -226,7 +226,6 @@ export const CryptoPayForm = ({
             paymentTokenSymbol,
             Number(amount),
             fundTokenSymbol,
-            fundAmount,
           );
         } else if (jobType === JobType.CVAT && cvatRequest) {
           await jobService.createCvatJob(

packages/apps/job-launcher/client/src/components/Jobs/Create/FiatPayForm.tsx

@@ -253,7 +253,6 @@ export const FiatPayForm = ({
           CURRENCY.usd,
           amount,
           tokenSymbol,
-          fundAmount,
         );
       } else if (jobType === JobType.CVAT && cvatRequest) {
         await createCvatJob(

packages/apps/job-launcher/client/src/services/job.ts

@@ -15,14 +15,10 @@ import {
 import api from '../utils/api';
 import { getFilenameFromContentDisposition } from '../utils/string';
 
-const buildFortuneManifest = (
-  data: FortuneRequest,
-  fundAmount: number,
-): FortuneManifest => ({
+const buildFortuneManifest = (data: FortuneRequest): FortuneManifest => ({
   submissionsRequired: Number(data.fortunesRequested),
   requesterTitle: data.title,
   requesterDescription: data.description,
-  fundAmount,
   requestType: JobType.FORTUNE,
   qualifications: data.qualifications,
 });
@@ -76,7 +72,6 @@ export const createFortuneJob = async (
   paymentCurrency: string,
   paymentAmount: number | string,
   escrowFundToken: string,
-  fundAmount: number,
 ) => {
   const body: CreateJobRequest<FortuneManifest> = {
     chainId,
@@ -85,7 +80,7 @@ export const createFortuneJob = async (
     paymentAmount: Number(paymentAmount),
     escrowFundToken,
     qualifications: data.qualifications,
-    manifest: buildFortuneManifest(data, fundAmount),
+    manifest: buildFortuneManifest(data),
   };
   await api.post('/job', body);
 };

packages/apps/job-launcher/client/src/types/index.ts

@@ -43,7 +43,7 @@ export type FortuneManifest = {
   submissionsRequired: number;
   requesterTitle: string;
   requesterDescription: string;
-  fundAmount: number;
+  fundAmount?: number;
   requestType: JobType.FORTUNE;
   qualifications?: string[];
 };

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

@@ -148,6 +148,9 @@ describe('JobService', () => {
         const jobManifestDto: JobManifestDto = createJobManifestDto({
           paymentCurrency: PaymentCurrency.USDC,
           escrowFundToken: EscrowFundToken.USDC,
+          manifest: createMockFortuneManifest({
+            fundAmount: undefined as unknown as number,
+          }),
         });
         const fundTokenDecimals = getTokenDecimals(
           jobManifestDto.chainId!,
@@ -179,6 +182,10 @@ describe('JobService', () => {
             mul(div(1, 100), jobManifestDto.paymentAmount),
           ).toFixed(18),
         );
+        const expectedManifest = {
+          ...jobManifestDto.manifest,
+          fundAmount: jobManifestDto.paymentAmount,
+        };
 
         expect(result).toBe(jobEntityMock.id);
         expect(mockWeb3Service.validateChainId).toHaveBeenCalledWith(
@@ -194,11 +201,11 @@ describe('JobService', () => {
         );
         expect(mockManifestService.validateManifest).toHaveBeenCalledWith(
           FortuneJobType.FORTUNE,
-          jobManifestDto.manifest,
+          expectedManifest,
         );
         expect(mockManifestService.uploadManifest).toHaveBeenCalledWith(
           jobManifestDto.chainId,
-          jobManifestDto.manifest,
+          expectedManifest,
           [
             jobManifestDto.exchangeOracle,
             jobManifestDto.reputationOracle,
@@ -238,6 +245,9 @@ describe('JobService', () => {
         const jobManifestDto: JobManifestDto = createJobManifestDto({
           paymentCurrency: PaymentCurrency.USD,
           escrowFundToken: EscrowFundToken.USDC,
+          manifest: createMockFortuneManifest({
+            fundAmount: undefined,
+          }),
         });
 
         const fundTokenDecimals = getTokenDecimals(
@@ -270,6 +280,16 @@ describe('JobService', () => {
             mul(div(1, 100), jobManifestDto.paymentAmount),
           ).toFixed(18),
         );
+        const expectedFundAmount = Number(
+          mul(
+            mul(jobManifestDto.paymentAmount, tokenToUsdRate),
+            usdToTokenRate,
+          ).toFixed(6),
+        );
+        const expectedManifest = {
+          ...jobManifestDto.manifest,
+          fundAmount: expectedFundAmount,
+        };
 
         expect(result).toBe(jobEntityMock.id);
 
@@ -286,11 +306,11 @@ describe('JobService', () => {
         );
         expect(mockManifestService.validateManifest).toHaveBeenCalledWith(
           FortuneJobType.FORTUNE,
-          jobManifestDto.manifest,
+          expectedManifest,
         );
         expect(mockManifestService.uploadManifest).toHaveBeenCalledWith(
           jobManifestDto.chainId,
-          jobManifestDto.manifest,
+          expectedManifest,
           [
             jobManifestDto.exchangeOracle,
             jobManifestDto.reputationOracle,
@@ -315,12 +335,7 @@ describe('JobService', () => {
               usdToTokenRate,
             ).toFixed(fundTokenDecimals),
           ),
-          fundAmount: Number(
-            mul(
-              mul(jobManifestDto.paymentAmount, tokenToUsdRate),
-              usdToTokenRate,
-            ).toFixed(6),
-          ),
+          fundAmount: expectedFundAmount,
           status: JobStatus.PAID,
           waitUntil: expect.any(Date),
           token: jobManifestDto.escrowFundToken,
@@ -338,6 +353,9 @@ describe('JobService', () => {
           exchangeOracle: null,
           recordingOracle: null,
           reputationOracle: null,
+          manifest: createMockFortuneManifest({
+            fundAmount: undefined,
+          }),
         });
 
         const fundTokenDecimals = getTokenDecimals(
@@ -379,6 +397,10 @@ describe('JobService', () => {
             mul(div(1, 100), jobManifestDto.paymentAmount),
           ).toFixed(18),
         );
+        const expectedManifest = {
+          ...jobManifestDto.manifest,
+          fundAmount: jobManifestDto.paymentAmount,
+        };
 
         expect(result).toBe(jobEntityMock.id);
 
@@ -394,11 +416,11 @@ describe('JobService', () => {
         ).not.toHaveBeenCalled();
         expect(mockManifestService.validateManifest).toHaveBeenCalledWith(
           FortuneJobType.FORTUNE,
-          jobManifestDto.manifest,
+          expectedManifest,
         );
         expect(mockManifestService.uploadManifest).toHaveBeenCalledWith(
           jobManifestDto.chainId,
-          jobManifestDto.manifest,
+          expectedManifest,
           [
             mockOracles.exchangeOracle,
             mockOracles.reputationOracle,
@@ -593,10 +615,7 @@ describe('JobService', () => {
           jobQuickLaunchDto.exchangeOracle,
           jobQuickLaunchDto.recordingOracle,
         );
-        expect(mockManifestService.downloadManifest).toHaveBeenCalledWith(
-          jobQuickLaunchDto.manifestUrl,
-          HCaptchaJobType.HCAPTCHA,
-        );
+        expect(mockManifestService.downloadManifest).not.toHaveBeenCalled();
         expect(mockManifestService.validateManifest).not.toHaveBeenCalled();
         expect(mockManifestService.uploadManifest).not.toHaveBeenCalled();
         expect(mockPaymentService.createWithdrawalPayment).toHaveBeenCalledWith(

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

@@ -249,11 +249,16 @@ export class JobService {
 
       jobEntity.manifestUrl = dto.manifestUrl;
     } else if ('manifest' in dto) {
-      await this.manifestService.validateManifest(requestType, dto.manifest);
+      const manifest = dto.manifest;
+      if (requestType === FortuneJobType.FORTUNE) {
+        (manifest as FortuneManifestDto).fundAmount = fundTokenAmount;
+      }
+
+      await this.manifestService.validateManifest(requestType, manifest);
 
       const { url, hash } = await this.manifestService.uploadManifest(
         chainId,
-        dto.manifest,
+        manifest,
         [exchangeOracle, reputationOracle, recordingOracle],
       );