Merge branch 'develop' into feat/staking-requirement

Author: flopez7

.changeset/eleven-clubs-itch.md

@@ -0,0 +1,5 @@
+---
+"@human-protocol/sdk": patch
+---
+
+Change contract visibility from private to public in EscrowClient and KVStoreClient

.changeset/hot-animals-trade.md

@@ -0,0 +1,5 @@
+---
+"@human-protocol/sdk": patch
+---
+
+Update LEADER_FRAGMENT to include address field in reputationNetworks

.changeset/swift-impalas-scream.md

@@ -0,0 +1,5 @@
+---
+"@human-protocol/logger": patch
+---
+
+Fixed nest/common peer dep version range

packages/apps/dashboard/client/src/features/searchResults/api/useKvStoreData.ts

@@ -12,7 +12,7 @@ const useKvstoreData = (chainId: number, address: string) => {
     queryFn: async () => {
       const { data } = await httpClient.get(
         `${apiPaths.kvstore.path}/${address}`,
-        { params: { chain_id: chainId || -1 } }
+        { params: { chainId: chainId || -1 } }
       );
 
       const validResponse = validateResponse(data, kvstoreDataSchema);

packages/apps/dashboard/server/.env.example

@@ -22,7 +22,6 @@ S3_BUCKET=dashboard-hcaptcha-historical-stats
 S3_USE_SSL=false
 
 # Web3
-WEB3_ENV=testnet
 RPC_URL_POLYGON=https://rpc-amoy.polygon.technology
 RPC_URL_BSC_TESTNET=https://bsc-testnet.drpc.org
 RPC_URL_SEPOLIA=https://rpc.sepolia.org

packages/apps/dashboard/server/package.json

@@ -17,7 +17,8 @@
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand"
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "@human-protocol/core": "workspace:*",

packages/apps/dashboard/server/src/common/config/network-config.service.ts

@@ -1,18 +1,18 @@
-import { ChainId } from '@human-protocol/sdk';
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { Web3Env } from '../enums/web3';
+
 import {
-  LOCALHOST_CHAIN_IDS,
-  MAINNET_CHAIN_IDS,
-  TESTNET_CHAIN_IDS,
-} from '../utils/constants';
+  DevelopmentChainId,
+  ProductionChainId,
+  ChainIds,
+  type ChainId,
+} from '../constants';
 
 export interface TokensList {
   [key: string]: string | undefined;
 }
 export interface NetworkDto {
-  chainId: number;
+  chainId: ChainId;
   rpcUrl?: string;
 }
 
@@ -28,65 +28,53 @@ export class NetworkConfigService {
     this.networkMap = {
       ...(this.configService.get<string>('RPC_URL_ETHEREUM') && {
         ethereum: {
-          chainId: ChainId.MAINNET,
+          chainId: ProductionChainId.ETHEREUM,
           rpcUrl: this.configService.get<string>('RPC_URL_ETHEREUM'),
         },
       }),
       ...(this.configService.get<string>('RPC_URL_SEPOLIA') && {
         sepolia: {
-          chainId: ChainId.SEPOLIA,
+          chainId: DevelopmentChainId.SEPOLIA,
           rpcUrl: this.configService.get<string>('RPC_URL_SEPOLIA'),
         },
       }),
       ...(this.configService.get<string>('RPC_URL_POLYGON') && {
         polygon: {
-          chainId: ChainId.POLYGON,
+          chainId: ProductionChainId.POLYGON_MAINNET,
           rpcUrl: this.configService.get<string>('RPC_URL_POLYGON'),
         },
       }),
       ...(this.configService.get<string>('RPC_URL_POLYGON_AMOY') && {
         amoy: {
-          chainId: ChainId.POLYGON_AMOY,
+          chainId: DevelopmentChainId.POLYGON_AMOY,
           rpcUrl: this.configService.get<string>('RPC_URL_POLYGON_AMOY'),
         },
       }),
       ...(this.configService.get<string>('RPC_URL_BSC_MAINNET') && {
         bsc: {
-          chainId: ChainId.BSC_MAINNET,
+          chainId: ProductionChainId.BSC_MAINNET,
           rpcUrl: this.configService.get<string>('RPC_URL_BSC_MAINNET'),
         },
       }),
       ...(this.configService.get<string>('RPC_URL_BSC_TESTNET') && {
         bsctest: {
-          chainId: ChainId.BSC_TESTNET,
+          chainId: DevelopmentChainId.BSC_TESTNET,
           rpcUrl: this.configService.get<string>('RPC_URL_BSC_TESTNET'),
         },
       }),
       ...(this.configService.get<string>('RPC_URL_LOCALHOST') && {
         localhost: {
-          chainId: ChainId.LOCALHOST,
+          chainId: DevelopmentChainId.LOCALHOST,
           rpcUrl: this.configService.get<string>('RPC_URL_LOCALHOST'),
         },
       }),
     };
-    const validChainIds = (() => {
-      switch (this.configService.get<string>('WEB3_ENV')) {
-        case Web3Env.MAINNET:
-          return MAINNET_CHAIN_IDS;
-        case Web3Env.LOCALHOST:
-          return LOCALHOST_CHAIN_IDS;
-        default:
-          return TESTNET_CHAIN_IDS;
-      }
-    })();
 
     // Remove networks without RPC URLs
     this.networkMap = Object.keys(this.networkMap)
       .filter((network) => {
         const networkConfig = this.networkMap[network];
-        return (
-          networkConfig.rpcUrl && validChainIds.includes(networkConfig.chainId)
-        );
+        return networkConfig.rpcUrl && ChainIds.includes(networkConfig.chainId);
       })
       .reduce((newNetworkMap: NetworkMapDto, network) => {
         newNetworkMap[network] = this.networkMap[network];

packages/apps/dashboard/server/src/common/constants/chains.ts

@@ -0,0 +1,28 @@
+import { ChainId as SdkChainId } from '@human-protocol/sdk';
+
+import Environment from '../utils/environment';
+
+export const ProductionChainId = {
+  POLYGON_MAINNET: SdkChainId.POLYGON,
+  BSC_MAINNET: SdkChainId.BSC_MAINNET,
+  ETHEREUM: SdkChainId.MAINNET,
+} as const satisfies Record<string, SdkChainId>;
+
+type ProductionChainId =
+  (typeof ProductionChainId)[keyof typeof ProductionChainId];
+
+export const DevelopmentChainId = {
+  POLYGON_AMOY: SdkChainId.POLYGON_AMOY,
+  BSC_TESTNET: SdkChainId.BSC_TESTNET,
+  SEPOLIA: SdkChainId.SEPOLIA,
+  LOCALHOST: SdkChainId.LOCALHOST,
+} as const satisfies Record<string, SdkChainId>;
+
+type DevelopmentChainId =
+  (typeof DevelopmentChainId)[keyof typeof DevelopmentChainId];
+
+export const ChainIds = Object.values(
+  Environment.isProduction() ? ProductionChainId : DevelopmentChainId,
+).filter((value): value is ChainId => typeof value === 'number');
+
+export type ChainId = ProductionChainId | DevelopmentChainId;

packages/apps/dashboard/server/src/common/constants/index.ts

@@ -0,0 +1,2 @@
+export * from './chains';
+export * from './operator';