Merge branch 'develop' into subgraph-upgrades

portuu3 · portuu3 · commit 25d052892393 · 2024-10-01T17:41:09.000+02:00
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-prettier": "^5.2.1",
     "ethers": "^6.12.1",
-    "husky": "^9.0.11",
+    "husky": "^9.1.6",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^15.2.7",
diff --git a/packages/apps/dashboard/ui-2024/package.json b/packages/apps/dashboard/ui-2024/package.json
@@ -51,7 +51,7 @@
     "sass": "^1.78.0",
     "stylelint-prettier": "^5.0.0",
     "typescript": "^5.2.2",
-    "vite": "^5.2.0",
+    "vite": "^5.4.7",
     "vite-plugin-svgr": "^4.2.0"
   }
 }
diff --git a/packages/apps/dashboard/ui/package.json b/packages/apps/dashboard/ui/package.json
@@ -60,9 +60,9 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "happy-dom": "^12.9.1",
     "identity-obj-proxy": "^3.0.0",
-    "jsdom": "^24.1.1",
+    "jsdom": "^25.0.1",
     "resize-observer-polyfill": "^1.5.1",
-    "vite": "^5.0.12",
+    "vite": "^5.4.7",
     "vite-plugin-node-polyfills": "^0.22.0",
     "vitest": "^1.6.0"
   },
diff --git a/packages/apps/faucet-server/package.json b/packages/apps/faucet-server/package.json
@@ -17,7 +17,7 @@
     "axios": "^1.3.4",
     "body-parser": "^1.20.0",
     "cors": "^2.8.5",
-    "express": "^4.19.2",
+    "express": "^4.21.0",
     "express-rate-limit": "^7.3.0",
     "node-cache": "^5.1.2",
     "web3": "^4.12.1"
diff --git a/packages/apps/fortune/exchange-oracle/client/package.json b/packages/apps/fortune/exchange-oracle/client/package.json
@@ -50,7 +50,7 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-refresh": "^0.4.11",
     "typescript": "^5.2.2",
-    "vite": "^5.3.1"
+    "vite": "^5.4.7"
   },
   "lint-staged": {
     "*.{ts,tsx}": [
diff --git a/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.dto.ts b/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.dto.ts
@@ -99,7 +99,7 @@ export class JobDto {
   jobDescription?: string;
 
   @ApiProperty({ name: 'reward_amount' })
-  rewardAmount?: number;
+  rewardAmount?: string;
 
   @ApiProperty({ name: 'reward_token' })
   rewardToken?: string;
diff --git a/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.service.ts b/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.service.ts
@@ -172,8 +172,9 @@ export class JobService {
             data.fields?.includes(JobFieldName.RewardAmount) ||
             data.sortField === JobSortField.REWARD_AMOUNT
           ) {
-            job.rewardAmount =
-              manifest.fundAmount / manifest.submissionsRequired;
+            job.rewardAmount = (
+              manifest.fundAmount / manifest.submissionsRequired
+            ).toString();
           }
           if (data.fields?.includes(JobFieldName.RewardToken)) {
             job.rewardToken = TOKEN;
@@ -189,8 +190,8 @@ export class JobService {
 
     if (data.sortField === JobSortField.REWARD_AMOUNT) {
       jobs.sort((a, b) => {
-        const rewardA = a.rewardAmount ?? 0;
-        const rewardB = b.rewardAmount ?? 0;
+        const rewardA = Number(a.rewardAmount ?? 0);
+        const rewardB = Number(b.rewardAmount ?? 0);
         if (data.sort === SortDirection.DESC) {
           return rewardB - rewardA;
         } else {
diff --git a/packages/apps/fortune/recording-oracle/src/common/enums/webhook.ts b/packages/apps/fortune/recording-oracle/src/common/enums/webhook.ts
@@ -1,6 +1,6 @@
 export enum EventType {
   ESCROW_COMPLETED = 'escrow_completed',
-  TASK_COMPLETED = 'task_completed',
+  JOB_COMPLETED = 'job_completed',
   SUBMISSION_REJECTED = 'submission_rejected',
   SUBMISSION_IN_REVIEW = 'submission_in_review',
 }
diff --git a/packages/apps/fortune/recording-oracle/src/modules/job/job.service.spec.ts b/packages/apps/fortune/recording-oracle/src/modules/job/job.service.spec.ts
@@ -483,7 +483,7 @@ describe('JobService', () => {
       const expectedBody = {
         chain_id: jobSolution.chainId,
         escrow_address: jobSolution.escrowAddress,
-        event_type: EventType.TASK_COMPLETED,
+        event_type: EventType.JOB_COMPLETED,
       };
       expect(result).toEqual('The requested job is completed.');
       expect(httpServicePostMock).toHaveBeenCalledWith(
@@ -575,7 +575,7 @@ describe('JobService', () => {
     const expectedBody = {
       chain_id: jobSolution.chainId,
       escrow_address: jobSolution.escrowAddress,
-      event_type: EventType.TASK_COMPLETED,
+      event_type: EventType.JOB_COMPLETED,
     };
     expect(result).toEqual('The requested job is completed.');
     expect(httpServicePostMock).toHaveBeenCalledWith(
diff --git a/packages/apps/fortune/recording-oracle/src/modules/job/job.service.ts b/packages/apps/fortune/recording-oracle/src/modules/job/job.service.ts
@@ -203,7 +203,7 @@ export class JobService {
           {
             chainId: webhook.chainId,
             escrowAddress: webhook.escrowAddress,
-            eventType: EventType.TASK_COMPLETED,
+            eventType: EventType.JOB_COMPLETED,
           },
           this.web3ConfigService.privateKey,
         );
diff --git a/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.spec.ts b/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.spec.ts
@@ -130,15 +130,15 @@ describe('webhookController', () => {
       const webhook: WebhookDto = {
         chainId,
         escrowAddress,
-        eventType: EventType.TASK_COMPLETED,
+        eventType: EventType.JOB_COMPLETED,
       };
       jest.spyOn(webhookService, 'handleWebhook');
 
       (verifySignature as jest.Mock).mockReturnValue(true);
 
       await expect(
         webhookController.processWebhook(MOCK_SIGNATURE, webhook),
-      ).rejects.toThrow('Invalid webhook event type: task_completed');
+      ).rejects.toThrow('Invalid webhook event type: job_completed');
 
       expect(webhookService.handleWebhook).toHaveBeenCalledWith(webhook);
     });
diff --git a/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.service.spec.ts b/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.service.spec.ts
@@ -114,11 +114,11 @@ describe('WebhookService', () => {
       const webhook: WebhookDto = {
         chainId,
         escrowAddress,
-        eventType: EventType.TASK_COMPLETED,
+        eventType: EventType.JOB_COMPLETED,
       };
 
       await expect(webhookService.handleWebhook(webhook)).rejects.toThrow(
-        'Invalid webhook event type: task_completed',
+        'Invalid webhook event type: job_completed',
       );
     });
   });
diff --git a/packages/apps/human-app/frontend/package.json b/packages/apps/human-app/frontend/package.json
@@ -66,12 +66,12 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react-refresh": "^0.4.11",
-    "husky": "^9.0.10",
-    "jsdom": "^24.1.1",
+    "husky": "^9.1.6",
+    "jsdom": "^25.0.1",
     "lint-staged": "^15.2.1",
     "prettier": "^3.2.5",
     "typescript": "^5.2.2",
-    "vite": "^5.0.8",
+    "vite": "^5.4.7",
     "vitest": "^1.2.2"
   }
 }
diff --git a/packages/apps/human-app/frontend/src/shared/helpers/format-date.ts b/packages/apps/human-app/frontend/src/shared/helpers/format-date.ts
@@ -2,5 +2,5 @@ import { parseISO, format } from 'date-fns';
 
 export const formatDate = (dateString: string) => {
   const parsedDate = parseISO(dateString);
-  return format(parsedDate, 'yyyy-MM-dd');
+  return format(parsedDate, 'yyyy-MM-dd HH:mm:ss');
 };
diff --git a/packages/apps/human-app/server/src/integrations/exchange-oracle/exchange-oracle.gateway.ts b/packages/apps/human-app/server/src/integrations/exchange-oracle/exchange-oracle.gateway.ts
@@ -55,7 +55,7 @@ export class ExchangeOracleGateway {
       return response.data as T;
     } catch (e) {
       console.error(
-        `Error, while executing exchange oracle API call, error details: ${e}`,
+        `Error, while executing exchange oracle API call to ${options.url}, error details: ${e}`,
       );
       throw e;
     }
diff --git a/packages/apps/job-launcher/client/package.json b/packages/apps/job-launcher/client/package.json
@@ -73,9 +73,9 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "happy-dom": "^12.9.1",
     "identity-obj-proxy": "^3.0.0",
-    "jsdom": "^24.1.1",
+    "jsdom": "^25.0.1",
     "resize-observer-polyfill": "^1.5.1",
-    "vite": "^5.0.12",
+    "vite": "^5.4.7",
     "vite-plugin-node-polyfills": "^0.22.0",
     "vitest": "^1.6.0"
   },
diff --git a/packages/apps/job-launcher/client/src/components/Jobs/Create/CvatJobRequestForm.tsx b/packages/apps/job-launcher/client/src/components/Jobs/Create/CvatJobRequestForm.tsx
@@ -375,40 +375,55 @@ export const CvatJobRequestForm = () => {
                 </FormControl>
               </Grid>
 
-              <Grid item xs={12}>
-                <FormControl fullWidth>
-                  <Autocomplete
-                    multiple
-                    options={qualificationsOptions}
-                    getOptionLabel={(option) => option.title}
-                    value={values.qualifications}
-                    onChange={(event, newValues) => {
-                      setFieldValue('qualifications', newValues);
-                    }}
-                    selectOnFocus
-                    onBlur={handleBlur}
-                    handleHomeEndKeys
-                    renderTags={(value, getTagProps) =>
-                      value.map((option, index) => (
-                        <Chip
-                          label={option.title}
-                          {...getTagProps({ index })}
-                        />
-                      ))
-                    }
-                    renderInput={(params) => (
-                      <Box display="flex" alignItems="center" width="100%">
-                        <TextField
-                          {...params}
-                          label="Qualifications"
-                          variant="outlined"
-                          onBlur={handleBlur}
-                          fullWidth
-                        />
-                      </Box>
-                    )}
-                  />
-                </FormControl>
+              <Grid item container xs={12} mt={0} spacing={2}>
+                <Grid item xs={12}>
+                  <Box display="flex">
+                    <Typography variant="body2" fontWeight={700}>
+                      Qualifications
+                    </Typography>
+                    <Tooltip title="Specify the required credentials or qualifications workers must have to get access to this job (e.g., english).">
+                      <HelpOutlineIcon
+                        color="secondary"
+                        sx={{ cursor: 'pointer', ml: 1 }}
+                      />
+                    </Tooltip>
+                  </Box>
+                </Grid>
+                <Grid item xs={12}>
+                  <FormControl fullWidth>
+                    <Autocomplete
+                      multiple
+                      options={qualificationsOptions}
+                      getOptionLabel={(option) => option.title}
+                      value={values.qualifications}
+                      onChange={(event, newValues) => {
+                        setFieldValue('qualifications', newValues);
+                      }}
+                      selectOnFocus
+                      onBlur={handleBlur}
+                      handleHomeEndKeys
+                      renderTags={(value, getTagProps) =>
+                        value.map((option, index) => (
+                          <Chip
+                            label={option.title}
+                            {...getTagProps({ index })}
+                          />
+                        ))
+                      }
+                      renderInput={(params) => (
+                        <Box display="flex" alignItems="center" width="100%">
+                          <TextField
+                            {...params}
+                            label="Qualifications"
+                            variant="outlined"
+                            onBlur={handleBlur}
+                            fullWidth
+                          />
+                        </Box>
+                      )}
+                    />
+                  </FormControl>
+                </Grid>
               </Grid>
             </Grid>
           </AccordionDetails>
@@ -624,7 +639,7 @@ export const CvatJobRequestForm = () => {
                         InputProps={{
                           endAdornment: (
                             <InputAdornment position="end">
-                              <Tooltip title="This field should contain the relative path to the data, excluding protocol symbols like '://'. For example, if the full URL is 'https://bucket.com/annotations/points_15.json', the input should only include 'annotations/points_15.json'.">
+                              <Tooltip title="This field should contain the relative path to the data, excluding protocol symbols like '://'. For example, if the full URL is 'https://bucket.com/annotations/points.json', the input should only include 'annotations/points.json'.">
                                 <HelpOutlineIcon
                                   color="secondary"
                                   sx={{ cursor: 'pointer' }}
diff --git a/packages/apps/job-launcher/client/src/components/Jobs/Create/FortuneJobRequestForm.tsx b/packages/apps/job-launcher/client/src/components/Jobs/Create/FortuneJobRequestForm.tsx
@@ -1,3 +1,4 @@
+import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
 import {
   Autocomplete,
   Box,
@@ -6,6 +7,7 @@ import {
   FormControl,
   Grid,
   TextField,
+  Tooltip,
   Typography,
 } from '@mui/material';
 import { Formik } from 'formik';
@@ -161,40 +163,59 @@ export const FortuneJobRequestForm = () => {
                     </FormControl>
                   </Grid>
 
-                  <Grid item xs={12}>
-                    <FormControl fullWidth>
-                      <Autocomplete
-                        multiple
-                        options={qualificationsOptions}
-                        getOptionLabel={(option) => option.title}
-                        value={values.qualifications}
-                        onChange={(event, newValues) => {
-                          setFieldValue('qualifications', newValues);
-                        }}
-                        selectOnFocus
-                        onBlur={handleBlur}
-                        handleHomeEndKeys
-                        renderTags={(value, getTagProps) =>
-                          value.map((option, index) => (
-                            <Chip
-                              label={option.title}
-                              {...getTagProps({ index })}
-                            />
-                          ))
-                        }
-                        renderInput={(params) => (
-                          <Box display="flex" alignItems="center" width="100%">
-                            <TextField
-                              {...params}
-                              label="Qualifications"
-                              variant="outlined"
-                              onBlur={handleBlur}
-                              fullWidth
-                            />
-                          </Box>
-                        )}
-                      />
-                    </FormControl>
+                  <Grid item container xs={12} mt={0} spacing={2}>
+                    <Grid item xs={12}>
+                      <Box display="flex">
+                        <Typography variant="body2" fontWeight={700}>
+                          Qualifications
+                        </Typography>
+                        <Tooltip title="Specify the required credentials or qualifications workers must have to get access to this job (e.g., english).">
+                          <HelpOutlineIcon
+                            color="secondary"
+                            sx={{ cursor: 'pointer', ml: 1 }}
+                          />
+                        </Tooltip>
+                      </Box>
+                    </Grid>
+                    <Grid item xs={12}>
+                      <FormControl fullWidth>
+                        <Autocomplete
+                          multiple
+                          options={qualificationsOptions}
+                          getOptionLabel={(option) => option.title}
+                          value={values.qualifications}
+                          onChange={(event, newValues) => {
+                            setFieldValue('qualifications', newValues);
+                          }}
+                          selectOnFocus
+                          onBlur={handleBlur}
+                          handleHomeEndKeys
+                          renderTags={(value, getTagProps) =>
+                            value.map((option, index) => (
+                              <Chip
+                                label={option.title}
+                                {...getTagProps({ index })}
+                              />
+                            ))
+                          }
+                          renderInput={(params) => (
+                            <Box
+                              display="flex"
+                              alignItems="center"
+                              width="100%"
+                            >
+                              <TextField
+                                {...params}
+                                label="Qualifications"
+                                variant="outlined"
+                                onBlur={handleBlur}
+                                fullWidth
+                              />
+                            </Box>
+                          )}
+                        />
+                      </FormControl>
+                    </Grid>
                   </Grid>
                 </Grid>
               </AccordionDetails>
diff --git a/packages/apps/job-launcher/client/src/components/Jobs/Create/HCaptchaJobRequestForm.tsx b/packages/apps/job-launcher/client/src/components/Jobs/Create/HCaptchaJobRequestForm.tsx
diff --git a/packages/apps/reputation-oracle/server/src/common/enums/webhook.ts b/packages/apps/reputation-oracle/server/src/common/enums/webhook.ts
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.service.spec.ts
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.service.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.service.ts
diff --git a/packages/core/package.json b/packages/core/package.json
diff --git a/packages/examples/cvat/exchange-oracle/src/chain/kvstore.py b/packages/examples/cvat/exchange-oracle/src/chain/kvstore.py
diff --git a/packages/examples/cvat/exchange-oracle/tests/integration/chain/test_kvstore.py b/packages/examples/cvat/exchange-oracle/tests/integration/chain/test_kvstore.py
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`"sass": "^1.78.0",`
`52`	`52`	`"stylelint-prettier": "^5.0.0",`
`53`	`53`	`"typescript": "^5.2.2",`
`54`		`- "vite": "^5.2.0",`
	`54`	`+ "vite": "^5.4.7",`
`55`	`55`	`"vite-plugin-svgr": "^4.2.0"`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`export enum EventType {`
`2`	`2`	`ESCROW_COMPLETED = 'escrow_completed',`
`3`		`- TASK_COMPLETED = 'task_completed',`
	`3`	`+ JOB_COMPLETED = 'job_completed',`
`4`	`4`	`SUBMISSION_REJECTED = 'submission_rejected',`
`5`	`5`	`SUBMISSION_IN_REVIEW = 'submission_in_review',`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ export class JobService {`
`203`	`203`	`{`
`204`	`204`	`chainId: webhook.chainId,`
`205`	`205`	`escrowAddress: webhook.escrowAddress,`
`206`		`- eventType: EventType.TASK_COMPLETED,`
	`206`	`+ eventType: EventType.JOB_COMPLETED,`
`207`	`207`	`},`
`208`	`208`	`this.web3ConfigService.privateKey,`
`209`	`209`	`);`