added comments where we need to switch out old api

0xsequence · Nov 15, 2024 · 84e1e85 · 84e1e85
1 parent 2ef4f33
commit 84e1e85
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 57 deletions.
diff --git a/examples/next/src/app/components/Connected.tsx b/examples/next/src/app/components/Connected.tsx
@@ -85,8 +85,10 @@ export const Connected = () => {
   const checkTokenBalancesForFeeOptions = async () => {
     if (pendingFeeOptionConfirmation) {
       const [account] = await walletClient!.getAddresses()
+      // ATTENTION: switch to new api
       const nativeTokenBalance = await indexerClient.getEtherBalance({ accountAddress: account })
 
+      // ATTENTION: switch to new api
       const tokenBalances = await indexerClient.getTokenBalances({
         accountAddress: account
       })

diff --git a/examples/react/src/components/Connected.tsx b/examples/react/src/components/Connected.tsx
@@ -132,8 +132,10 @@ export const Connected = () => {
   const checkTokenBalancesForFeeOptions = async () => {
     if (pendingFeeOptionConfirmation && walletClient) {
       const [account] = await walletClient.getAddresses()
+      // ATTENTION: switch to new api
       const nativeTokenBalance = await indexerClient.getEtherBalance({ accountAddress: account })
 
+      // ATTENTION: switch to new api
       const tokenBalances = await indexerClient.getTokenBalances({
         accountAddress: account
       })

diff --git a/packages/kit/src/hooks/data.ts b/packages/kit/src/hooks/data.ts
@@ -20,6 +20,7 @@ export const time = {
 }
 
 export const getNativeTokenBalance = async (indexerClient: SequenceIndexer, chainId: number, accountAddress: string) => {
+  // ATTENTION: switch to new api
   const res = await indexerClient.getEtherBalance({ accountAddress })
 
   const tokenBalance: TokenBalance = {
@@ -47,6 +48,7 @@ interface GetTokenBalancesArgs {
 }
 
 export const getTokenBalances = async (indexerClient: SequenceIndexer, args: GetTokenBalancesArgs) => {
+  // ATTENTION: switch to new api
   const res = await indexerClient.getTokenBalances({
     accountAddress: args.accountAddress,
     includeMetadata: args.includeMetadata ?? true,
@@ -60,6 +62,7 @@ export const getTokenBalances = async (indexerClient: SequenceIndexer, args: Get
 }
 
 export const getBalances = async (indexerClient: SequenceIndexer, chainId: number, args: GetTokenBalancesArgs) => {
+  // ATTENTION: switch to new api
   if (!args.accountAddress) {
     return []
   }
@@ -106,6 +109,7 @@ interface UseCoinBalanceArgs extends GetTokenBalancesArgs {
 }
 
 export const useCoinBalance = (args: UseCoinBalanceArgs) => {
+  // ATTENTION: switch to new api
   const indexerClient = useIndexerClient(args.chainId)
 
   return useQuery({
@@ -134,6 +138,7 @@ interface UseCollectibleBalanceArgs {
 }
 
 export const useCollectibleBalance = (args: UseCollectibleBalanceArgs) => {
+  // ATTENTION: switch to new api
   const indexerClient = useIndexerClient(args.chainId)
 
   return useQuery({
@@ -158,6 +163,7 @@ export const useCollectibleBalance = (args: UseCollectibleBalanceArgs) => {
 }
 
 export const getCollectionBalance = async (indexerClient: SequenceIndexer, args: UseCollectionBalanceArgs) => {
+  // ATTENTION: switch to new api
   const res = await indexerClient.getTokenBalances({
     accountAddress: args.accountAddress,
     contractAddress: args.contractAddress,
@@ -388,7 +394,7 @@ const getSwapPrices = async (
     const { withContractInfo, ...swapPricesArgs } = args
 
     const res = await apiClient.getSwapPrices({
-      ...swapPricesArgs,
+      ...swapPricesArgs
     })
 
     if (res.swapPrices === null) {
@@ -399,36 +405,34 @@ const getSwapPrices = async (
     if (withContractInfo) {
       res?.swapPrices.forEach(price => {
         const { currencyAddress: rawCurrencyAddress } = price
-        const currencyAddress = compareAddress(rawCurrencyAddress, NATIVE_TOKEN_ADDRESS_0X)
-          ? zeroAddress
-          : rawCurrencyAddress
+        const currencyAddress = compareAddress(rawCurrencyAddress, NATIVE_TOKEN_ADDRESS_0X) ? zeroAddress : rawCurrencyAddress
         const isNativeToken = compareAddress(currencyAddress, zeroAddress)
         if (currencyAddress && !currencyInfoMap.has(currencyAddress)) {
-          const getNativeTokenInfo = () =>new Promise<ContractInfo>((resolve, reject) => {
-            resolve({
-              ...network?.nativeToken,
-            logoURI: network?.logoURI || '',
-            address: zeroAddress
-            } as ContractInfo)
-          })
+          const getNativeTokenInfo = () =>
+            new Promise<ContractInfo>((resolve, reject) => {
+              resolve({
+                ...network?.nativeToken,
+                logoURI: network?.logoURI || '',
+                address: zeroAddress
+              } as ContractInfo)
+            })
 
           currencyInfoMap.set(
             currencyAddress,
-            isNativeToken ? 
-            getNativeTokenInfo().then(data => {
-              return data
-            })
-        :
-            metadataClient
-              .getContractInfo({
-                chainID: String(args.chainId),
-                contractAddress: currencyAddress
-              })
-              .then(data => {
-                return ({
-                  ...data.contractInfo,
+            isNativeToken
+              ? getNativeTokenInfo().then(data => {
+                  return data
                 })
-              })
+              : metadataClient
+                  .getContractInfo({
+                    chainID: String(args.chainId),
+                    contractAddress: currencyAddress
+                  })
+                  .then(data => {
+                    return {
+                      ...data.contractInfo
+                    }
+                  })
           )
         }
       })
@@ -437,53 +441,52 @@ const getSwapPrices = async (
     const currencyBalanceInfoMap = new Map<string, Promise<Balance>>()
     res?.swapPrices.forEach(price => {
       const { currencyAddress: rawCurrencyAddress } = price
-      const currencyAddress = compareAddress(rawCurrencyAddress, NATIVE_TOKEN_ADDRESS_0X)
-        ? zeroAddress
-        : rawCurrencyAddress
+      const currencyAddress = compareAddress(rawCurrencyAddress, NATIVE_TOKEN_ADDRESS_0X) ? zeroAddress : rawCurrencyAddress
       const isNativeToken = compareAddress(currencyAddress, zeroAddress)
+
+      // ATTENTION: switch to new api
       if (currencyAddress && !currencyBalanceInfoMap.has(currencyAddress)) {
         currencyBalanceInfoMap.set(
           currencyAddress,
-          isNativeToken ?
-            indexerClient.getEtherBalance({
-              accountAddress: args.userAddress
-            }).then(res => ({
-              balance: res.balance.balanceWei
-            }))
-          :
-          indexerClient
-            .getTokenBalances({
-              accountAddress: args.userAddress,
-              contractAddress: currencyAddress,
-              includeMetadata: false,
-              metadataOptions: {
-                verifiedOnly: true
-              }
-            })
-            .then(balances => {
-              return ({
-                balance: balances.balances?.[0].balance || '0'
-              })
-            })
+          isNativeToken
+            ? indexerClient
+                .getEtherBalance({
+                  accountAddress: args.userAddress
+                })
+                .then(res => ({
+                  balance: res.balance.balanceWei
+                }))
+            : indexerClient
+                .getTokenBalances({
+                  accountAddress: args.userAddress,
+                  contractAddress: currencyAddress,
+                  includeMetadata: false,
+                  metadataOptions: {
+                    verifiedOnly: true
+                  }
+                })
+                .then(balances => {
+                  return {
+                    balance: balances.balances?.[0].balance || '0'
+                  }
+                })
         )
       }
     })
 
     return Promise.all(
       res?.swapPrices.map(async price => {
         const { currencyAddress: rawCurrencyAddress } = price
-        const currencyAddress = compareAddress(rawCurrencyAddress, NATIVE_TOKEN_ADDRESS_0X)
-          ? zeroAddress
-          : rawCurrencyAddress
+        const currencyAddress = compareAddress(rawCurrencyAddress, NATIVE_TOKEN_ADDRESS_0X) ? zeroAddress : rawCurrencyAddress
 
-        return ({
+        return {
           price: {
             ...price,
             currencyAddress
           },
           info: (await currencyInfoMap.get(currencyAddress)) || undefined,
           balance: (await currencyBalanceInfoMap.get(currencyAddress)) || { balance: '0' }
-        })
+        }
       }) || []
     )
   } catch (e) {
@@ -510,7 +513,12 @@ export const useSwapPrices = (args: UseSwapPricesArgs, options: SwapPricesOption
   const indexerClient = useIndexerClient(args.chainId)
 
   const enabled =
-    !!args.chainId && !!args.userAddress && !!args.buyCurrencyAddress && !!args.buyAmount && args.buyAmount !== '0' && !options.disabled
+    !!args.chainId &&
+    !!args.userAddress &&
+    !!args.buyCurrencyAddress &&
+    !!args.buyAmount &&
+    args.buyAmount !== '0' &&
+    !options.disabled
 
   return useQuery({
     queryKey: ['swapPrices', args],
@@ -527,7 +535,7 @@ interface UseSwapQuoteOptions {
   disabled?: boolean
 }
 
-export const useSwapQuote  = (args:GetSwapQuoteArgs,  options: UseSwapQuoteOptions) => {
+export const useSwapQuote = (args: GetSwapQuoteArgs, options: UseSwapQuoteOptions) => {
   const apiClient = useAPIClient()
   const { disabled = false } = options
 
@@ -555,4 +563,4 @@ export const useSwapQuote  = (args:GetSwapQuoteArgs,  options: UseSwapQuoteOptio
     staleTime: time.oneMinute * 1,
     enabled: !disabled || !args.userAddress || !args.chainId || !args.buyCurrencyAddress
   })
-}
+}
diff --git a/packages/wallet/src/hooks/data.ts b/packages/wallet/src/hooks/data.ts
@@ -93,6 +93,7 @@ export const getBalancesAssetsSummary = async (
                   return []
                 }
 
+                // ATTENTION: switch to new api
                 return getTokenBalances(indexerClient, {
                   accountAddress,
                   contractAddress: asset.contractAddress,
@@ -112,6 +113,7 @@ export const getBalancesAssetsSummary = async (
         await Promise.all([
           ...indexerClientsArr.map(([chainId, indexerClient]) => getNativeTokenBalance(indexerClient, chainId, accountAddress)),
           ...indexerClientsArr.map(([_chainId, indexerClient]) =>
+            // ATTENTION: switch to new api
             getTokenBalances(indexerClient, {
               accountAddress,
               hideCollectibles,