feat: expand geo blocker

Author: therealemjy

.vscode/settings.json

@@ -20,7 +20,7 @@
     "editor.defaultFormatter": "vscode.css-language-features"
   },
   "[json]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
+    "editor.defaultFormatter": "biomejs.biome"
   },
   "[typescript]": {
     "editor.defaultFormatter": "biomejs.biome"

apps/evm/src/__mocks__/models/trade.ts

@@ -6,10 +6,21 @@ import fakeAddress, { altAddress } from './address';
 import { poolData } from './pools';
 
 const pool = poolData[0];
-const xvsAsset = pool.assets[0];
-const usdcAsset = pool.assets[1];
-const usdtAsset = pool.assets[2];
-const busdAsset = pool.assets[3];
+const tradePool = {
+  ...pool,
+  assets: pool.assets.map(asset =>
+    asset.vToken.address === pool.assets[3].vToken.address
+      ? {
+          ...asset,
+          isRestricted: false,
+        }
+      : asset,
+  ),
+};
+const xvsAsset = tradePool.assets[0];
+const usdcAsset = tradePool.assets[1];
+const usdtAsset = tradePool.assets[2];
+const busdAsset = tradePool.assets[3];
 
 export const apiTradePositions: ApiTradePosition[] = [
   {
@@ -109,7 +120,7 @@ export const apiTradePositions: ApiTradePosition[] = [
 
 export const tradePositions: TradePosition[] = [
   formatToTradePosition({
-    pool,
+    pool: tradePool,
     chainId: busdAsset.vToken.underlyingToken.chainId,
     positionAccountAddress: fakeAddress,
     dsaVTokenAddress: xvsAsset.vToken.address,
@@ -128,7 +139,7 @@ export const tradePositions: TradePosition[] = [
     unrealizedPnlPercentage: 0,
   })!,
   formatToTradePosition({
-    pool,
+    pool: tradePool,
     chainId: busdAsset.vToken.underlyingToken.chainId,
     positionAccountAddress: altAddress,
     dsaVTokenAddress: usdcAsset.vToken.address,
@@ -147,7 +158,7 @@ export const tradePositions: TradePosition[] = [
     unrealizedPnlPercentage: 1.2,
   })!,
   formatToTradePosition({
-    pool,
+    pool: tradePool,
     chainId: usdtAsset.vToken.underlyingToken.chainId,
     positionAccountAddress: altAddress,
     dsaVTokenAddress: usdcAsset.vToken.address,

apps/evm/src/clients/api/queries/getPendingRewards/getApiTokenPrice/index.ts

@@ -1,7 +1,6 @@
-import type { ChainId } from 'types';
+import type { ApiTokenPrice, ChainId } from 'types';
 import { restService } from 'utilities';
 import type { Address } from 'viem';
-import type { ApiTokenPrice } from '../../useGetPools/getPools/getApiPools';
 
 export interface GetApiTokenPriceInput {
   tokenAddresses: string[];

apps/evm/src/clients/api/queries/getRawTradePositions/__tests__/index.spec.ts

@@ -10,10 +10,10 @@ import { logError } from 'libs/errors';
 import { ChainId } from 'types';
 import { formatToTradePosition, restService } from 'utilities';
 import { type GetRawTradePositionsInput, getRawTradePositions } from '..';
-import { getPools } from '../../useGetPools/getPools';
+import { getPools } from '../../useGetPools/useGetPoolsQuery/getPools';
 
 vi.mock('utilities/restService');
-vi.mock('../../useGetPools/getPools', () => ({
+vi.mock('../../useGetPools/useGetPoolsQuery/getPools', () => ({
   getPools: vi.fn(),
 }));
 vi.mock('libs/errors', async () => {

apps/evm/src/clients/api/queries/getRawTradePositions/index.ts

@@ -8,7 +8,7 @@ import {
   formatToTradePosition,
   restService,
 } from 'utilities';
-import { getPools } from '../useGetPools/getPools';
+import { getPools } from '../useGetPools/useGetPoolsQuery/getPools';
 import type {
   GetApiTradePositionsOutput,
   GetRawTradePositionsInput,

apps/evm/src/clients/api/queries/useGetPools/applyCountryCodeToPools/index.ts

@@ -1,5 +1,5 @@
-import type { ApiTokenMetadata } from '../getPools/getApiPools';
 import type { GetPoolsOutput } from '../types';
+import type { ApiTokenMetadata } from '../useGetPoolsQuery/getPools/getApiPools';
 
 export const applyCountryCodeToPools = ({
   countryCode,
@@ -22,10 +22,6 @@ export const applyCountryCodeToPools = ({
       const isRestricted = !!tokenMetadata?.restrictedCountries?.includes(countryCode);
       const isGated = !!tokenMetadata?.gatedCountries?.includes(countryCode);
 
-      if (asset.isRestricted === isRestricted && asset.isGated === isGated) {
-        return asset;
-      }
-
       return {
         ...asset,
         isRestricted,

apps/evm/src/clients/api/queries/useGetPools/index.ts

@@ -1,116 +1,21 @@
-import { type QueryObserverOptions, useQuery } from '@tanstack/react-query';
 import { useEffect, useMemo } from 'react';
 
 import { useGetIpLocation } from 'clients/api/queries/useGetIpLocation';
-import FunctionKey from 'constants/functionKey';
-import { useGetContractAddress } from 'hooks/useGetContractAddress';
-import { useIsFeatureEnabled } from 'hooks/useIsFeatureEnabled';
-import { useGetTokens } from 'libs/tokens';
-import { useChainId, usePublicClient } from 'libs/wallet';
-import type { ChainId } from 'types';
-import { generatePseudoRandomRefetchInterval } from 'utilities/generatePseudoRandomRefetchInterval';
 
 import { logError } from 'libs/errors';
 import { applyCountryCodeToPools } from './applyCountryCodeToPools';
-import { getPools } from './getPools';
-import type { GetPoolsQueryOutput } from './getPools';
-import type { GetPoolsInput, GetPoolsOutput } from './types';
+import type { GetPoolsOutput } from './types';
+import {
+  type TrimmedInput,
+  type UseGetPoolsQueryOptions,
+  useGetPoolsQuery,
+} from './useGetPoolsQuery';
 
-type TrimmedInput = Omit<
-  GetPoolsInput,
-  | 'chainId'
-  | 'tokens'
-  | 'publicClient'
-  | 'primeContractAddress'
-  | 'poolLensContractAddress'
-  | 'legacyPoolComptrollerContractAddress'
-  | 'venusLensContractAddress'
-  | 'vaiControllerContractAddress'
-  | 'resilientOracleContractAddress'
-  | 'isEModeFeatureEnabled'
->;
-
-export type UseGetPoolsQueryKey = [
-  FunctionKey.GET_POOLS,
-  TrimmedInput & {
-    chainId: ChainId;
-  },
-];
-
-type Options = QueryObserverOptions<
-  GetPoolsQueryOutput,
-  Error,
-  GetPoolsQueryOutput,
-  GetPoolsQueryOutput,
-  UseGetPoolsQueryKey
->;
-
-const refetchInterval = generatePseudoRandomRefetchInterval();
-
-export const useGetPools = (input?: TrimmedInput, options?: Options) => {
-  const isPrimeEnabled = useIsFeatureEnabled({
-    name: 'prime',
-  });
-
-  const isEModeFeatureEnabled = useIsFeatureEnabled({
-    name: 'eMode',
-  });
-
-  const accountAddress = input?.accountAddress;
-  const { chainId } = useChainId();
-  const tokens = useGetTokens();
-
-  const { publicClient } = usePublicClient();
-
-  const { address: primeContractAddress } = useGetContractAddress({
-    name: 'Prime',
-  });
-  const { address: poolLensContractAddress } = useGetContractAddress({
-    name: 'PoolLens',
-  });
-  const { address: legacyPoolComptrollerContractAddress } = useGetContractAddress({
-    name: 'LegacyPoolComptroller',
-  });
-  const { address: venusLensContractAddress } = useGetContractAddress({
-    name: 'VenusLens',
-  });
-  const { address: vaiControllerContractAddress } = useGetContractAddress({
-    name: 'VaiController',
-  });
-  const { address: resilientOracleContractAddress } = useGetContractAddress({
-    name: 'ResilientOracle',
-  });
-  const isEnabled = options?.enabled !== false;
-
-  const poolsQuery = useQuery({
-    queryKey: [FunctionKey.GET_POOLS, { ...input, chainId, accountAddress }],
-    queryFn: () =>
-      getPools({
-        publicClient,
-        chainId,
-        tokens,
-        legacyPoolComptrollerContractAddress,
-        venusLensContractAddress,
-        poolLensContractAddress,
-        vaiControllerContractAddress,
-        resilientOracleContractAddress,
-        primeContractAddress: isPrimeEnabled ? primeContractAddress : undefined,
-        isEModeFeatureEnabled,
-        ...input,
-      }),
-    placeholderData: (previousOutput, previousInput) => {
-      // Return previous data if chain ID param hasn't changed and user address was undefined
-      const previousChainId = previousInput?.queryKey[1]?.chainId;
-      return previousChainId === chainId && !previousInput?.queryKey[1].accountAddress
-        ? previousOutput
-        : undefined;
-    },
-    refetchInterval,
-    ...options,
-  });
+export const useGetPools = (input?: TrimmedInput, options?: UseGetPoolsQueryOptions) => {
+  const poolsQuery = useGetPoolsQuery(input, options);
 
   const { data: getIpLocationData, error: getIpLocationError } = useGetIpLocation({
-    enabled: isEnabled,
+    enabled: options?.enabled !== false,
   });
 
   useEffect(() => {

…endPrimeSimulationDistributions/index.ts …endPrimeSimulationDistributions/index.tsapps/evm/src/clients/api/queries/useGetPools/getPools/appendPrimeSimulationDistributions/index.ts renamed to apps/evm/src/clients/api/queries/useGetPools/useGetPoolsQuery/getPools/appendPrimeSimulationDistributions/index.ts apps/evm/src/clients/api/queries/useGetPools/getPools/appendPrimeSimulationDistributions/index.ts renamed to apps/evm/src/clients/api/queries/useGetPools/useGetPoolsQuery/getPools/appendPrimeSimulationDistributions/index.ts

@@ -5,13 +5,13 @@ import { calculateDailyTokenRate } from 'utilities/calculateDailyTokenRate';
 import findTokenByAddress from 'utilities/findTokenByAddress';
 import formatRewardDistribution from './formatRewardDistribution';
 
+import { convertPriceMantissaToDollars } from 'utilities';
+import type { PrimeApy } from '../../../../types';
 import type {
   ApiPointsDistribution,
   ApiRewardDistributor,
   ApiTokenMetadata,
-} from 'clients/api/queries/useGetPools/getPools/getApiPools';
-import { convertPriceMantissaToDollars } from 'utilities';
-import type { PrimeApy } from '../../../types';
+} from '../../getApiPools';
 import { isDistributingRewards } from './isDistributingRewards';
 
 export type FormatDistributionsInput = {