Merge pull request #693 from humanprotocol/develop

Release Q3 - sprint 2

Author: portuu3

.github/workflows/ci-test-meta-code-verify.yml renamed to .github/workflows/ci-test-meta-code-verify.yaml

@@ -4,6 +4,7 @@ export const ConfigNames = {
   HOST: 'HOST',
   PORT: 'PORT',
   WEB3_PRIVATE_KEY: 'WEB3_PRIVATE_KEY',
+  REPUTATION_ORACLE_URL: 'REPUTATION_ORACLE_URL',
 };
 
 export const envValidator = Joi.object({

packages/apps/fortune/exchange-oracle/server/src/common/config/env.ts

@@ -1,3 +1,4 @@
+import { ConfigService } from '@nestjs/config';
 import { Test } from '@nestjs/testing';
 import { JobController } from './job.controller';
 import { JobService } from './job.service';
@@ -14,11 +15,20 @@ describe('JobController', () => {
   const escrowAddress = '0x1234567890123456789012345678901234567890';
   const workerAddress = '0x1234567890123456789012345678901234567891';
 
+  const reputationOracleURL = 'https://example.com/reputationoracle';
+  const configServiceMock = {
+    get: jest.fn().mockReturnValue(reputationOracleURL),
+  };
+
   beforeAll(async () => {
     const moduleRef = await Test.createTestingModule({
       controllers: [JobController],
       providers: [
         JobService,
+        {
+          provide: ConfigService,
+          useValue: configServiceMock,
+        },
         {
           provide: Web3Service,
           useValue: {

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

@@ -1,11 +1,12 @@
 import { Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
 import { JobController } from './job.controller';
 import { JobService } from './job.service';
 import { HttpModule } from '@nestjs/axios';
 import { Web3Module } from '../web3/web3.module';
 
 @Module({
-  imports: [HttpModule, Web3Module],
+  imports: [ConfigModule, HttpModule, Web3Module],
   controllers: [JobController],
   providers: [JobService],
 })

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

@@ -1,13 +1,10 @@
 import { HttpService } from '@nestjs/axios';
+import { ConfigService } from '@nestjs/config';
 import { Test } from '@nestjs/testing';
 import { of } from 'rxjs';
 import { Web3Service } from '../web3/web3.service';
 import { JobService } from './job.service';
-import {
-  EscrowClient,
-  KVStoreClient,
-  StorageClient,
-} from '@human-protocol/sdk';
+import { EscrowClient, KVStoreClient } from '@human-protocol/sdk';
 
 jest.mock('@human-protocol/sdk', () => ({
   ...jest.requireActual('@human-protocol/sdk'),
@@ -27,8 +24,10 @@ jest.mock('axios', () => ({
 }));
 
 describe('JobService', () => {
+  let configService: ConfigService;
   let jobService: JobService;
   let web3Service: Web3Service;
+  let httpService: HttpService;
 
   const chainId = 1;
   const escrowAddress = '0x1234567890123456789012345678901234567890';
@@ -39,6 +38,11 @@ describe('JobService', () => {
     getNetwork: jest.fn().mockResolvedValue({ chainId: 1 }),
   };
 
+  const reputationOracleURL = 'https://example.com/reputationoracle';
+  const configServiceMock = {
+    get: jest.fn().mockReturnValue(reputationOracleURL),
+  };
+
   const httpServicePostMock = jest
     .fn()
     .mockReturnValue(of({ status: 200, data: {} }));
@@ -47,6 +51,10 @@ describe('JobService', () => {
     const moduleRef = await Test.createTestingModule({
       providers: [
         JobService,
+        {
+          provide: ConfigService,
+          useValue: configServiceMock,
+        },
         {
           provide: Web3Service,
           useValue: {
@@ -57,13 +65,18 @@ describe('JobService', () => {
           provide: HttpService,
           useValue: {
             post: httpServicePostMock,
+            axiosRef: {
+              get: jest.fn(),
+            },
           },
         },
       ],
     }).compile();
 
+    configService = moduleRef.get<ConfigService>(ConfigService);
     jobService = moduleRef.get<JobService>(JobService);
     web3Service = moduleRef.get<Web3Service>(Web3Service);
+    httpService = moduleRef.get<HttpService>(HttpService);
   });
 
   describe('getDetails', () => {
@@ -74,14 +87,10 @@ describe('JobService', () => {
         fortunesRequested: 5,
         fundAmount: 100,
       };
-      (EscrowClient.build as any).mockImplementation(() => ({
-        getManifestUrl: jest
-          .fn()
-          .mockResolvedValue('https://example.com/manifest.json'),
-      }));
-      (StorageClient.downloadFileFromUrl as any).mockResolvedValue({
-        ...manifest,
-        fortunesRequired: manifest.fortunesRequested,
+
+      httpService.axiosRef.get = jest.fn().mockResolvedValue({
+        status: 200,
+        data: { ...manifest, fortunesRequired: manifest.fortunesRequested },
       });
 
       const result = await jobService.getDetails(chainId, escrowAddress);
@@ -91,37 +100,14 @@ describe('JobService', () => {
         chainId,
         manifest,
       });
-      expect(web3Service.getSigner).toHaveBeenCalledWith(chainId);
     });
 
-    it('should fail if the escrow address is invalid', async () => {
-      const escrowAddress = 'invalid_address';
-      (EscrowClient.build as any).mockImplementation(() => ({
-        getManifestUrl: jest
-          .fn()
-          .mockRejectedValue(new Error('Invalid address')),
-      }));
+    it('should fail if reputation oracle url is empty', async () => {
+      configService.get = jest.fn().mockReturnValue('');
 
       await expect(
         jobService.getDetails(chainId, escrowAddress),
-      ).rejects.toThrow('Invalid address');
-      expect(web3Service.getSigner).toHaveBeenCalledWith(chainId);
-    });
-
-    it('should fail if the file does not exist', async () => {
-      (EscrowClient.build as any).mockImplementation(() => ({
-        getManifestUrl: jest
-          .fn()
-          .mockResolvedValue('https://example.com/manifest.json'),
-      }));
-      (StorageClient.downloadFileFromUrl as any).mockRejectedValue(
-        new Error('File not found'),
-      );
-
-      await expect(
-        jobService.getDetails(chainId, escrowAddress),
-      ).rejects.toThrow('File not found');
-      expect(web3Service.getSigner).toHaveBeenCalledWith(chainId);
+      ).rejects.toThrow('Unable to get Reputation Oracle URL');
     });
   });
 

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

@@ -3,10 +3,11 @@ import {
   EscrowStatus,
   KVStoreClient,
   KVStoreKeys,
-  StorageClient,
 } from '@human-protocol/sdk';
 import { HttpService } from '@nestjs/axios';
 import { Inject, Injectable, Logger } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { ConfigNames } from '../../common/config';
 import { Web3Service } from '../web3/web3.service';
 import { JobDetailsDto } from './job.dto';
 
@@ -18,6 +19,7 @@ export class JobService {
   } = {};
 
   constructor(
+    private readonly configService: ConfigService,
     @Inject(Web3Service)
     private readonly web3Service: Web3Service,
     private readonly httpService: HttpService,
@@ -27,10 +29,19 @@ export class JobService {
     chainId: number,
     escrowAddress: string,
   ): Promise<JobDetailsDto> {
-    const signer = this.web3Service.getSigner(chainId);
-    const escrowClient = await EscrowClient.build(signer);
-    const manifestUrl = await escrowClient.getManifestUrl(escrowAddress);
-    const manifest = await StorageClient.downloadFileFromUrl(manifestUrl);
+    const reputationOracleURL = this.configService.get(
+      ConfigNames.REPUTATION_ORACLE_URL,
+    );
+
+    if (!reputationOracleURL)
+      throw new Error('Unable to get Reputation Oracle URL');
+
+    const manifest = await this.httpService.axiosRef
+      .get<any>(
+        reputationOracleURL +
+          `/manifest?chainId=${chainId}&escrowAddress=${escrowAddress}`,
+      )
+      .then((res) => res.data);
 
     return {
       escrowAddress,

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

@@ -43,7 +43,7 @@ import { envValidator } from './common/config';
     UserModule,
     JobModule,
     PaymentModule,
-    Web3Module
+    Web3Module,
   ],
   controllers: [AppController],
 })

packages/apps/job-launcher/server/src/app.module.ts

@@ -75,9 +75,11 @@ export const envValidator = Joi.object({
   S3_BACKET: Joi.string().default('launcher'),
   S3_USE_SSL: Joi.string().default(false),
   // Stripe
-  STRIPE_SECRET_KEY: Joi.string().default('sk_test_51MO1RkABE7VUdqB3hviLNxMYafYQYhvtWd3Jaj9ZEH3SvkxM4frJLz00FmC5J8xYbNGhmzwobaLkN0GKUbuhQDvx00NeZwI93C'),
+  STRIPE_SECRET_KEY: Joi.string().default(
+    'sk_test_51MO1RkABE7VUdqB3hviLNxMYafYQYhvtWd3Jaj9ZEH3SvkxM4frJLz00FmC5J8xYbNGhmzwobaLkN0GKUbuhQDvx00NeZwI93C',
+  ),
   STRIPE_API_VERSION: Joi.string().default('2022-11-15'),
   STRIPE_APP_NAME: Joi.string().default('Fortune'),
   STRIPE_APP_VERSION: Joi.string().default('0.0.1'),
   STRIPE_APP_INFO_URL: Joi.string().default('https://hmt.ai'),
-});
+});

packages/apps/job-launcher/server/src/common/config/env.ts

@@ -1,2 +1,2 @@
 export * from './env';
-export * from './networks';
+export * from './networks';

packages/apps/job-launcher/server/src/common/config/index.ts

@@ -1,39 +1,39 @@
 export interface NetworkDto {
-    chainId: number;
-    rpcUrl: string;
-  }
-  
-  interface NetworkMapDto {
-    [key: string]: NetworkDto;
-  }
-  
-  export const networkMap: NetworkMapDto = {
-    polygon: {
-      chainId: 137,
-      rpcUrl:
-        'https://polygon-mainnet.g.alchemy.com/v2/0Lorh5KRkGl5FsRwy2epTg8fEFFoqUfY',
-    },
-    bsc: {
-      chainId: 56,
-      rpcUrl: 'https://bsc-dataseed1.binance.org/',
-    },
-    mumbai: {
-      chainId: 80001,
-      rpcUrl:
-        'https://polygon-mumbai.g.alchemy.com/v2/vKNSJzJf6SW2sdW-05bgFwoyFxUrMzii',
-    },
-    goerli: {
-      chainId: 5,
-      rpcUrl: 'https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161',
-    },
-    moonbeam: {
-      chainId: 1284,
-      rpcUrl: 'https://rpc.api.moonbeam.network',
-    },
-    bsctest: {
-      chainId: 97,
-      rpcUrl: 'https://data-seed-prebsc-1-s1.binance.org:8545/',
-    },
-  };
-  
-  export const networks = Object.values(networkMap).map((network) => network);
+  chainId: number;
+  rpcUrl: string;
+}
+
+interface NetworkMapDto {
+  [key: string]: NetworkDto;
+}
+
+export const networkMap: NetworkMapDto = {
+  polygon: {
+    chainId: 137,
+    rpcUrl:
+      'https://polygon-mainnet.g.alchemy.com/v2/0Lorh5KRkGl5FsRwy2epTg8fEFFoqUfY',
+  },
+  bsc: {
+    chainId: 56,
+    rpcUrl: 'https://bsc-dataseed1.binance.org/',
+  },
+  mumbai: {
+    chainId: 80001,
+    rpcUrl:
+      'https://polygon-mumbai.g.alchemy.com/v2/vKNSJzJf6SW2sdW-05bgFwoyFxUrMzii',
+  },
+  goerli: {
+    chainId: 5,
+    rpcUrl: 'https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161',
+  },
+  moonbeam: {
+    chainId: 1284,
+    rpcUrl: 'https://rpc.api.moonbeam.network',
+  },
+  bsctest: {
+    chainId: 97,
+    rpcUrl: 'https://data-seed-prebsc-1-s1.binance.org:8545/',
+  },
+};
+
+export const networks = Object.values(networkMap).map((network) => network);