Merge branch 'develop' into feat/sdk/manifest-url

Author: portuu3

packages/apps/dashboard/client/src/features/searchResults/model/addressDetailsSchema.ts

@@ -3,33 +3,15 @@ import { z } from 'zod';
 
 import { reputationSchema } from '@/shared/model/reputationSchema';
 
-const transformOptionalTokenAmount = (
-  value: string | undefined | null,
-  ctx: z.RefinementCtx
-) => {
-  if (value === undefined || value === null) return value;
-
-  const valueAsNumber = Number(value);
-
-  if (Number.isNaN(valueAsNumber)) {
-    ctx.addIssue({
-      path: ['amountStaked'],
-      code: z.ZodIssueCode.custom,
-    });
-  }
-
-  return valueAsNumber / 10 ** 18;
-};
-
 const walletSchema = z.object({
   chainId: z.number(),
   address: z.string(),
-  balance: z.string().transform(transformOptionalTokenAmount),
-  amountStaked: z.string().transform(transformOptionalTokenAmount),
-  amountLocked: z.string().transform(transformOptionalTokenAmount),
-  amountWithdrawable: z.string().transform(transformOptionalTokenAmount),
+  balance: z.string(),
+  amountStaked: z.string(),
+  amountLocked: z.string(),
+  amountWithdrawable: z.string(),
   reputation: reputationSchema,
-  totalHMTAmountReceived: z.string().transform(transformOptionalTokenAmount),
+  totalHMTAmountReceived: z.string(),
   payoutCount: z.number().or(z.string()),
 });
 
@@ -59,7 +41,7 @@ export type AddressDetailsEscrow = z.infer<typeof escrowSchema>;
 const operatorSchema = z.object({
   chainId: z.number(),
   address: z.string(),
-  balance: z.string().transform(transformOptionalTokenAmount),
+  balance: z.string(),
   role: z
     .enum([
       Role.JobLauncher,
@@ -68,12 +50,9 @@ const operatorSchema = z.object({
       Role.ReputationOracle,
     ])
     .nullable(),
-  amountStaked: z.string().optional().transform(transformOptionalTokenAmount),
-  amountLocked: z.string().optional().transform(transformOptionalTokenAmount),
-  amountWithdrawable: z
-    .string()
-    .optional()
-    .transform(transformOptionalTokenAmount),
+  amountStaked: z.string().optional(),
+  amountLocked: z.string().optional(),
+  amountWithdrawable: z.string().optional(),
   lockedUntilTimestamp: z.string().optional(),
   reputation: reputationSchema,
   fee: z.number(),

packages/apps/dashboard/client/src/features/searchResults/ui/EscrowAddress.tsx

@@ -41,11 +41,7 @@ const EscrowAddress: FC<Props> = ({ data }) => {
             {isHmt ? (
               <HmtBalance balance={balance} />
             ) : (
-              <TokenAmount
-                amount={balance}
-                tokenSymbol={tokenSymbol}
-                alreadyParsed
-              />
+              <TokenAmount amount={balance} tokenSymbol={tokenSymbol} />
             )}
           </TitleSectionWrapper>
         ) : null}
@@ -56,18 +52,10 @@ const EscrowAddress: FC<Props> = ({ data }) => {
           <Typography variant="body2">{factoryAddress}</Typography>
         </TitleSectionWrapper>
         <TitleSectionWrapper title="Total Funded Amount">
-          <TokenAmount
-            amount={totalFundedAmount}
-            tokenSymbol={tokenSymbol}
-            alreadyParsed
-          />
+          <TokenAmount amount={totalFundedAmount} tokenSymbol={tokenSymbol} />
         </TitleSectionWrapper>
         <TitleSectionWrapper title="Paid Amount">
-          <TokenAmount
-            amount={amountPaid}
-            tokenSymbol={tokenSymbol}
-            alreadyParsed
-          />
+          <TokenAmount amount={amountPaid} tokenSymbol={tokenSymbol} />
         </TitleSectionWrapper>
 
         <TitleSectionWrapper title="Status">

packages/apps/dashboard/client/src/features/searchResults/ui/HmtBalance.tsx

@@ -22,13 +22,11 @@ const HmtBalance: FC<Props> = ({ balance }) => {
     return <span>...</span>;
   }
 
-  const _balance =
-    Number(balance) < 1 ? Number(balance) * 1e18 : Number(balance);
-  const balanceInDollars = balance ? (_balance * data).toFixed(2) : 0;
+  const balanceInDollars = balance ? (+balance * data).toFixed(2) : 0;
 
   return (
     <Stack flexDirection="row" whiteSpace="nowrap">
-      <TokenAmount amount={_balance} alreadyParsed />
+      <TokenAmount amount={balance} />
       <Typography component="span" variant="body2" color="text.secondary">
         {`($${balanceInDollars})`}
       </Typography>

packages/apps/dashboard/client/src/features/searchResults/ui/StakeInfo.tsx

@@ -8,9 +8,9 @@ import SectionWrapper from '@/shared/ui/SectionWrapper';
 import TokenAmount from './TokenAmount';
 
 type Props = {
-  amountStaked?: number | null;
-  amountLocked?: number | null;
-  amountWithdrawable?: number | null;
+  amountStaked?: string | number | null;
+  amountLocked?: string | number | null;
+  amountWithdrawable?: string | number | null;
 };
 
 const StakeInfo: FC<Props> = ({
@@ -26,23 +26,23 @@ const StakeInfo: FC<Props> = ({
         Stake Info
       </Typography>
       <Stack gap={4}>
-        {Number.isFinite(amountStaked) && (
+        {Number.isFinite(Number(amountStaked)) && (
           <Stack gap={{ xs: 1, md: 0 }} direction={{ sm: 'column', md: 'row' }}>
             <Typography variant="subtitle2" width={300}>
               Staked Tokens
             </Typography>
             <TokenAmount amount={amountStaked} />
           </Stack>
         )}
-        {Number.isFinite(amountLocked) && (
+        {Number.isFinite(Number(amountLocked)) && (
           <Stack gap={{ xs: 1, md: 0 }} direction={{ sm: 'column', md: 'row' }}>
             <Typography variant="subtitle2" width={300}>
               Locked Tokens
             </Typography>
             <TokenAmount amount={amountLocked} />
           </Stack>
         )}
-        {Number.isFinite(amountWithdrawable) && (
+        {Number.isFinite(Number(amountWithdrawable)) && (
           <Stack gap={{ xs: 1, md: 0 }} direction={{ sm: 'column', md: 'row' }}>
             <Typography variant="subtitle2" width={300}>
               Withdrawable Tokens

packages/apps/dashboard/client/src/features/searchResults/ui/TokenAmount.tsx

@@ -9,21 +9,16 @@ import FormattedNumber from '@/shared/ui/FormattedNumber';
 type Props = {
   amount: number | string | null | undefined;
   tokenSymbol?: string | null | undefined;
-  alreadyParsed?: boolean;
 };
 
-const TokenAmount: FC<Props> = ({
-  amount,
-  tokenSymbol = 'HMT',
-  alreadyParsed = false,
-}) => {
+const TokenAmount: FC<Props> = ({ amount, tokenSymbol = 'HMT' }) => {
   const isMobile = useIsMobile();
 
   return (
     <Stack direction="row" whiteSpace="nowrap">
       <Typography variant="body2">
         <FormattedNumber
-          value={(Number(amount) || 0) * (alreadyParsed ? 1 : 1e18)}
+          value={Number(amount) || 0}
           decimalScale={isMobile ? 4 : 9}
         />
       </Typography>

packages/apps/faucet/server/package.json

@@ -30,7 +30,7 @@
     "@types/node": "^22.15.16",
     "concurrently": "^9.1.2",
     "eslint": "^8.55.0",
-    "hardhat": "^2.24.0",
+    "hardhat": "^2.26.0",
     "jest": "^29.7.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"

packages/apps/fortune/exchange-oracle/server/Dockerfile

@@ -16,6 +16,7 @@ COPY ${APP_PATH}/package.json ./${APP_PATH}/
 # so we need to copy and build them
 COPY packages/core ./packages/core
 COPY packages/sdk ./packages/sdk
+COPY packages/libs ./packages/libs
 
 RUN yarn install
 

packages/apps/fortune/exchange-oracle/server/package.json

@@ -28,6 +28,7 @@
     "generate-env-doc": "ts-node scripts/generate-env-doc.ts"
   },
   "dependencies": {
+    "@human-protocol/logger": "workspace:*",
     "@human-protocol/sdk": "workspace:*",
     "@nestjs/axios": "^3.1.2",
     "@nestjs/common": "^10.2.7",

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

@@ -19,6 +19,7 @@ import { UserModule } from './modules/user/user.module';
 import { Web3Module } from './modules/web3/web3.module';
 import { WebhookModule } from './modules/webhook/webhook.module';
 import { HttpValidationPipe } from './common/pipes';
+import Environment from './common/utils/environment';
 
 @Module({
   providers: [
@@ -54,7 +55,7 @@ import { HttpValidationPipe } from './common/pipes';
       /**
        * First value found takes precendece
        */
-      envFilePath: [`.env.${process.env.NODE_ENV}`, '.env.local', '.env'],
+      envFilePath: [`.env.${Environment.name}`, '.env.local', '.env'],
       validationSchema: envValidator,
     }),
     DatabaseModule,

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

@@ -2,7 +2,6 @@ import * as Joi from 'joi';
 
 export const envValidator = Joi.object({
   // General
-  NODE_ENV: Joi.string(),
   HOST: Joi.string(),
   PORT: Joi.string(),
   FE_URL: Joi.string(),