Merge branch 'develop' into ba/polygons-support

# Conflicts:
#	packages/examples/cvat/exchange-oracle/src/core/types.py
#	packages/examples/cvat/exchange-oracle/tests/api/test_exchange_api.py
#	packages/examples/cvat/recording-oracle/src/core/types.py

Author: Bobronium

packages/apps/fortune/exchange-oracle/client/src/providers/WagmiProvider.tsx

@@ -1,5 +1,5 @@
 import { FC, PropsWithChildren } from 'react';
-import { createConfig, WagmiProvider as WWagmiProvider } from 'wagmi';
+import { createConfig, http, WagmiProvider as WWagmiProvider } from 'wagmi';
 import * as wagmiChains from 'wagmi/chains';
 import { coinbaseWallet, walletConnect } from 'wagmi/connectors';
 
@@ -32,6 +32,21 @@ export const wagmiConfig = createConfig({
       appName: 'human-job-launcher',
     }),
   ],
+  transports: {
+    [wagmiChains.mainnet.id]: http(),
+    [wagmiChains.sepolia.id]: http(),
+    [wagmiChains.bsc.id]: http(),
+    [wagmiChains.bscTestnet.id]: http(),
+    [wagmiChains.polygon.id]: http(),
+    [wagmiChains.polygonAmoy.id]: http(),
+    [wagmiChains.moonbeam.id]: http(),
+    [wagmiChains.moonbaseAlpha.id]: http(),
+    [wagmiChains.avalanche.id]: http(),
+    [wagmiChains.avalancheFuji.id]: http(),
+    [wagmiChains.xLayer.id]: http(),
+    [wagmiChains.xLayerTestnet.id]: http(),
+    [LOCALHOST.id]: http(LOCALHOST.rpcUrls.default.http[0]),
+  },
 });
 
 export const WagmiProvider: FC<PropsWithChildren> = ({ children }) => {

packages/apps/fortune/exchange-oracle/server/src/common/interceptors/transform-enum.interceptor.ts

@@ -55,7 +55,10 @@ export class TransformEnumInterceptor implements NestInterceptor {
       : null;
   }
 
-  private transformEnums(bodyOrQuery: any, targetClass: ClassConstructor<any>): any {
+  private transformEnums(
+    bodyOrQuery: any,
+    targetClass: ClassConstructor<any>,
+  ): any {
     // Convert the body or query to an instance of the target class
     let transformedInstance = plainToInstance(targetClass, bodyOrQuery);
 
@@ -111,4 +114,4 @@ export class TransformEnumInterceptor implements NestInterceptor {
     }
     return bodyOrQuery;
   }
-}
+}

packages/apps/fortune/exchange-oracle/server/src/common/pagination/pagination.dto.ts

@@ -1,11 +1,5 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import {
-  IsNumber,
-  IsOptional,
-  Max,
-  Min,
-  IsArray,
-} from 'class-validator';
+import { IsNumber, IsOptional, Max, Min, IsArray } from 'class-validator';
 import { Type } from 'class-transformer';
 import { SortDirection } from '../enums/collection';
 import { IsEnumCaseInsensitive } from '../decorators/enums';

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

@@ -57,13 +57,10 @@ describe('assignmentController', () => {
         .spyOn(assignmentService, 'getAssignmentList')
         .mockResolvedValue(expectedResult);
 
-      const result = await assignmentController.getAssignments(
-        query,
-        {
-          user: { address: userAddress, reputationNetwork: reputationNetwork },
-          headers: { referer: MOCK_EXCHANGE_ORACLE },
-        } as any,
-      );
+      const result = await assignmentController.getAssignments(query, {
+        user: { address: userAddress, reputationNetwork: reputationNetwork },
+        headers: { referer: MOCK_EXCHANGE_ORACLE },
+      } as any);
       expect(result).toBe(expectedResult);
       expect(assignmentService.getAssignmentList).toHaveBeenCalledWith(
         query,
@@ -82,12 +79,9 @@ describe('assignmentController', () => {
       jest
         .spyOn(assignmentService, 'createAssignment')
         .mockResolvedValue({ id: 1 } as any);
-      await assignmentController.createAssignment(
-        body,
-        {
-          user: { address: userAddress },
-        } as RequestWithUser,
-      );
+      await assignmentController.createAssignment(body, {
+        user: { address: userAddress },
+      } as RequestWithUser);
       expect(assignmentService.createAssignment).toHaveBeenCalledWith(body, {
         address: userAddress,
       });
@@ -103,10 +97,9 @@ describe('assignmentController', () => {
 
       jest.spyOn(assignmentService, 'resign').mockResolvedValue();
 
-      await assignmentController.resign(
-        resignJobDto,
-        { user: { address: userAddress } } as RequestWithUser,
-      );
+      await assignmentController.resign(resignJobDto, {
+        user: { address: userAddress },
+      } as RequestWithUser);
 
       expect(assignmentService.resign).toHaveBeenCalledWith(
         assignmentId,

packages/apps/human-app/frontend/.eslintrc.cjs

@@ -20,10 +20,7 @@ module.exports = {
   },
   plugins: ['react-refresh'],
   rules: {
-    'react-refresh/only-export-components': [
-      'warn',
-      { allowConstantExport: true },
-    ],
+    'react-refresh/only-export-components': 'off',
     'import/extensions': [
       'error',
       'ignorePackages',

packages/apps/human-app/frontend/src/api/api-paths.ts

@@ -45,6 +45,9 @@ export const apiPaths = {
     resignJob: {
       path: '/assignment/resign-job',
     },
+    refreshJob: {
+      path: '/assignment/refresh',
+    },
     registerAddress: {
       path: '/user/register-address',
       withAuthRetry: true,

packages/apps/human-app/frontend/src/api/services/worker/assign-job.ts

@@ -1,5 +1,9 @@
 import { z } from 'zod';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
+import {
+  type MutationKey,
+  useMutation,
+  useQueryClient,
+} from '@tanstack/react-query';
 import { apiClient } from '@/api/api-client';
 import { apiPaths } from '@/api/api-paths';
 
@@ -18,10 +22,13 @@ function assignJob(data: AssignJobBody) {
   });
 }
 
-export function useAssignJobMutation(callbacks?: {
-  onSuccess: () => Promise<void>;
-  onError: (error: unknown) => Promise<void>;
-}) {
+export function useAssignJobMutation(
+  callbacks?: {
+    onSuccess: () => Promise<void>;
+    onError: (error: unknown) => Promise<void>;
+  },
+  mutationKey?: MutationKey
+) {
   const queryClient = useQueryClient();
 
   return useMutation({
@@ -34,5 +41,6 @@ export function useAssignJobMutation(callbacks?: {
       await queryClient.invalidateQueries();
       void callbacks?.onError(error);
     },
+    mutationKey,
   });
 }

packages/apps/human-app/frontend/src/api/services/worker/oracles.ts

@@ -37,21 +37,22 @@ export async function getOracles({
   signal: AbortSignal;
 }) {
   let oracles = [H_CAPTCHA_ORACLE];
-  const queryParams = selected_job_types.length
-    ? `?${stringifyUrlQueryObject({ selected_job_types })}`
-    : '';
+  if (env.VITE_FEATURE_FLAG_JOBS_DISCOVERY) {
+    const queryParams = selected_job_types.length
+      ? `?${stringifyUrlQueryObject({ selected_job_types })}`
+      : '';
 
-  const result = await apiClient(
-    `${apiPaths.worker.oracles.path}${queryParams}`,
-    {
-      successSchema: OraclesSuccessSchema,
-      options: { method: 'GET' },
-    },
-    signal
-  );
-
-  oracles = oracles.concat(result);
+    const result = await apiClient(
+      `${apiPaths.worker.oracles.path}${queryParams}`,
+      {
+        successSchema: OraclesSuccessSchema,
+        options: { method: 'GET' },
+      },
+      signal
+    );
 
+    oracles = oracles.concat(result);
+  }
   return oracles;
 }
 

packages/apps/human-app/frontend/src/api/services/worker/refresh-tasks.ts

@@ -0,0 +1,35 @@
+import { z } from 'zod';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { apiClient } from '@/api/api-client';
+import { apiPaths } from '@/api/api-paths';
+
+function refreshTasks(data: { oracle_address: string }) {
+  return apiClient(apiPaths.worker.refreshJob.path, {
+    successSchema: z.unknown(),
+    authenticated: true,
+    options: { method: 'PUT', body: JSON.stringify(data) },
+  });
+}
+
+export function useRefreshTasksMutation(callbacks?: {
+  onSuccess?: () => Promise<void>;
+  onError?: (error: unknown) => Promise<void>;
+}) {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: refreshTasks,
+    onSuccess: async () => {
+      if (callbacks?.onSuccess) {
+        void callbacks.onSuccess();
+      }
+      await queryClient.invalidateQueries();
+    },
+    onError: async (error) => {
+      if (callbacks?.onError) {
+        void callbacks.onError(error);
+      }
+      await queryClient.invalidateQueries();
+    },
+  });
+}

packages/apps/human-app/frontend/src/components/layout/drawer-menu-items/drawer-menu-items-worker.tsx

@@ -5,24 +5,21 @@ import type {
 } from '@/components/layout/protected/drawer-navigation';
 import { HelpIcon, UserOutlinedIcon, WorkIcon } from '@/components/ui/icons';
 import { routerPaths } from '@/router/router-paths';
-import { env } from '@/shared/env';
 import { DarkModeSwitch } from '@/components/ui/dark-mode-switch';
 import type { UserData } from '@/auth/auth-context';
 
 export const workerDrawerTopMenuItems = (
   user: UserData | null
 ): TopMenuItem[] => {
   return [
-    ...(env.VITE_FEATURE_FLAG_JOBS_DISCOVERY
-      ? [
-          {
-            label: t('components.DrawerNavigation.jobs'),
-            icon: <WorkIcon />,
-            link: routerPaths.worker.jobsDiscovery,
-            disabled: !user?.wallet_address || user.kyc_status !== 'approved',
-          },
-        ]
-      : []),
+    ...[
+      {
+        label: t('components.DrawerNavigation.jobs'),
+        icon: <WorkIcon />,
+        link: routerPaths.worker.jobsDiscovery,
+        disabled: !user?.wallet_address || user.kyc_status !== 'approved',
+      },
+    ],
   ];
 };