Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …

…brody/QR-code-scanner-fixes

* 'develop' of https://github.com/rainbow-me/rainbow:
  [APP-379]: Update client to use new token search aggregator across networks (#5190)
  tx sim: error handling for unknown urls (#5213)
  handle hex tx types (#5214)
  chore: supply metadata graphql api key (#5211)

globals.d.ts

@@ -88,6 +88,7 @@ declare module 'react-native-dotenv' {
   export const LOG_DEBUG: string;
   export const QUIET_OLD_LOGGER: string;
   export const ARC_GRAPHQL_API_KEY: string;
+  export const METADATA_GRAPHQL_API_KEY: string;
   export const RESERVOIR_API_KEY_PROD: string;
   export const RESERVOIR_API_KEY_DEV: string;
   export const RPC_PROXY_BASE_URL_PROD: string;

src/entities/tokens.ts

@@ -2,6 +2,7 @@ import { ChainId } from '@rainbow-me/swaps';
 import { AssetType } from './assetTypes';
 import { EthereumAddress } from '.';
 import { Network } from '@/helpers';
+import { Chain } from '@wagmi/chains';
 
 export interface ZerionAssetPrice {
   value: number;
@@ -88,6 +89,29 @@ export interface SwappableAsset extends ParsedAddressAsset {
   network?: Network;
 }
 
+export interface TokenSearchNetwork {
+  address: string;
+  decimals: number;
+}
+
+export interface TokenSearchToken {
+  decimals: number;
+  highLiquidity: boolean;
+  name: string;
+  symbol: string;
+  uniqueId: string;
+  colors: { primary: string; fallback: string };
+  icon_url: string;
+  color: string;
+  shadowColor: string;
+  rainbowMetadataId: number;
+  isRainbowCurated: boolean;
+  isVerified: boolean;
+  networks: {
+    [chainId in Chain['id']]: TokenSearchNetwork;
+  };
+}
+
 export interface RainbowToken extends Asset {
   color?: string;
   highLiquidity?: boolean;

src/graphql/utils/getFetchRequester.ts

@@ -2,7 +2,10 @@ import { rainbowFetch, RainbowFetchRequestOpts } from '@/rainbow-fetch';
 import { DocumentNode } from 'graphql';
 import { resolveRequestDocument } from 'graphql-request';
 import { buildGetQueryParams } from '@/graphql/utils/buildGetQueryParams';
-import { ARC_GRAPHQL_API_KEY } from 'react-native-dotenv';
+import {
+  ARC_GRAPHQL_API_KEY,
+  METADATA_GRAPHQL_API_KEY,
+} from 'react-native-dotenv';
 
 const allowedOperations = ['mutation', 'query'];
 
@@ -40,6 +43,16 @@ const additionalConfig: {
       'x-api-key': ARC_GRAPHQL_API_KEY,
     },
   },
+  metadata: {
+    headers: {
+      Authorization: `Bearer ${METADATA_GRAPHQL_API_KEY}`,
+    },
+  },
+  simulation: {
+    headers: {
+      Authorization: `Bearer ${METADATA_GRAPHQL_API_KEY}`,
+    },
+  },
 };
 
 export function getFetchRequester(config: Config) {

src/handlers/tokenSearch.ts

@@ -8,6 +8,12 @@ import {
 } from '@/entities';
 import { logger, RainbowError } from '@/logger';
 import { EthereumAddress } from '@rainbow-me/swaps';
+import { RainbowToken, TokenSearchToken } from '@/entities/tokens';
+import ethereumUtils from '@/utils/ethereumUtils';
+
+type TokenSearchApiResponse = {
+  data: TokenSearchToken[];
+};
 
 const tokenSearchApi = new RainbowFetchClient({
   baseURL: 'https://token-search.rainbow.me/v2',
@@ -18,7 +24,7 @@ const tokenSearchApi = new RainbowFetchClient({
   timeout: 30000,
 });
 
-export const tokenSearch = async (searchParams: {
+export const swapSearch = async (searchParams: {
   chainId: number;
   fromChainId?: number | '';
   keys: TokenSearchUniswapAssetKey[];
@@ -60,6 +66,65 @@ export const tokenSearch = async (searchParams: {
   }
 };
 
+export const tokenSearch = async (searchParams: {
+  chainId: number;
+  fromChainId?: number | '';
+  keys: TokenSearchUniswapAssetKey[];
+  list: TokenSearchTokenListId;
+  threshold: TokenSearchThreshold;
+  query: string;
+}): Promise<RainbowToken[]> => {
+  const queryParams: {
+    keys: TokenSearchUniswapAssetKey[];
+    list: TokenSearchTokenListId;
+    threshold: TokenSearchThreshold;
+    query?: string;
+    fromChainId?: number;
+  } = {
+    keys: searchParams.keys,
+    list: searchParams.list,
+    threshold: searchParams.threshold,
+    query: searchParams.query,
+  };
+
+  try {
+    if (isAddress(searchParams.query)) {
+      // @ts-ignore
+      params.keys = `networks.${params.chainId}.address`;
+    }
+    const url = `/?${qs.stringify(queryParams)}`;
+    const tokenSearch = await tokenSearchApi.get<TokenSearchApiResponse>(url);
+    if (!tokenSearch.data?.data) {
+      return [];
+    }
+
+    return tokenSearch.data.data.map(token => {
+      const networkKeys = Object.keys(token.networks);
+      const type = ethereumUtils.getAssetTypeFromNetwork(
+        ethereumUtils.getNetworkFromChainId(Number(networkKeys[0]))
+      );
+      return {
+        ...token,
+        address:
+          token.networks['1']?.address ||
+          token.networks[Number(networkKeys[0])]?.address,
+        type,
+        mainnet_address: token.networks['1']?.address,
+      };
+    });
+  } catch (e: any) {
+    logger.error(
+      new RainbowError(`An error occurred while searching for query`),
+      {
+        query: searchParams.query,
+        message: e.message,
+      }
+    );
+
+    return [];
+  }
+};
+
 export const walletFilter = async (params: {
   addresses: EthereumAddress[];
   fromChainId: number;

src/hooks/index.ts

@@ -146,6 +146,7 @@ export {
   useHardwareBackOnFocus,
 } from './useHardwareBack';
 export { default as useSwapCurrencyList } from './useSwapCurrencyList';
+export { default as useSearchCurrencyList } from './useSearchCurrencyList';
 export { default as useWalletENSAvatar } from './useWalletENSAvatar';
 export { default as useImagePicker } from './useImagePicker';
 export { default as useLatestCallback } from './useLatestCallback';