[SDK] Include native tokens in Insight.getOwnedTokens (#7243)

Author: joaquim-verges

.changeset/shaky-seals-cheer.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Include native tokens in Insight.getOwnedTokens

packages/thirdweb/src/insight/get-tokens.ts

@@ -1,12 +1,12 @@
 import type {
-  GetV1TokensErc20ByOwnerAddressData,
-  GetV1TokensErc20ByOwnerAddressResponse,
+  GetV1TokensData,
+  GetV1TokensResponse,
 } from "@thirdweb-dev/insight";
 import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
 import type { GetWalletBalanceResult } from "../wallets/utils/getWalletBalance.js";
 
-type OwnedToken = GetV1TokensErc20ByOwnerAddressResponse["data"][number];
+type OwnedToken = GetV1TokensResponse["data"][number];
 
 /**
  * Get ERC20 tokens owned by an address
@@ -26,10 +26,13 @@ export async function getOwnedTokens(args: {
   client: ThirdwebClient;
   chains: Chain[];
   ownerAddress: string;
-  queryOptions?: GetV1TokensErc20ByOwnerAddressData["query"];
+  queryOptions?: Omit<
+    GetV1TokensData["query"],
+    "owner_address" | "chain_id" | "chain"
+  >;
 }): Promise<GetWalletBalanceResult[]> {
   const [
-    { getV1TokensErc20ByOwnerAddress },
+    { getV1Tokens },
     { getThirdwebDomains },
     { getClientFetch },
     { assertInsightEnabled },
@@ -46,19 +49,18 @@ export async function getOwnedTokens(args: {
 
   await assertInsightEnabled(chains);
 
-  const defaultQueryOptions: GetV1TokensErc20ByOwnerAddressData["query"] = {
-    chain: chains.map((chain) => chain.id),
+  const defaultQueryOptions: GetV1TokensData["query"] = {
+    owner_address: ownerAddress,
+    chain_id: chains.map((chain) => chain.id),
+    include_native: "true",
     include_spam: "false",
     metadata: "true",
     limit: 50,
   };
 
-  const result = await getV1TokensErc20ByOwnerAddress({
+  const result = await getV1Tokens({
     baseUrl: `https://${getThirdwebDomains().insight}`,
     fetch: getClientFetch(client),
-    path: {
-      ownerAddress: ownerAddress,
-    },
     query: {
       ...defaultQueryOptions,
       ...queryOptions,

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.tsx

@@ -141,17 +141,37 @@ async function fetchBalancesForWallet({
   const insightChunks = chunkChains(insightEnabledChains);
   await Promise.all(
     insightChunks.map(async (chunk) => {
-      const owned = await getOwnedTokens({
-        ownerAddress: account.address,
-        chains: chunk,
-        client,
-      });
+      let owned: GetWalletBalanceResult[] = [];
+      let page = 0;
+      const limit = 100;
+
+      while (true) {
+        const batch = await getOwnedTokens({
+          ownerAddress: account.address,
+          chains: chunk,
+          client,
+          queryOptions: {
+            limit,
+            page,
+          },
+        }).catch((err) => {
+          console.error("error fetching balances from insight", err);
+          return [];
+        });
+
+        if (batch.length === 0) {
+          break;
+        }
+
+        owned = [...owned, ...batch];
+        page += 1;
+      }
 
       for (const b of owned) {
         const matching = sourceSupportedTokens[b.chainId]?.find(
           (t) => t.address.toLowerCase() === b.tokenAddress.toLowerCase(),
         );
-        if (matching) {
+        if (matching && b.value > 0n) {
           balances.push({
             balance: b,
             chain: getCachedChain(b.chainId),
@@ -187,14 +207,18 @@ async function fetchBalancesForWallet({
     const chainId = Number(chainIdStr);
     const chain = getCachedChain(chainId);
 
+    if (insightEnabledChains.some((c) => c.id === chainId)) {
+      continue;
+    }
+
     for (const token of tokens) {
       const isNative = isNativeToken(token);
       const isAlreadyFetched = balances.some(
         (b) =>
           b.chain.id === chainId &&
           b.token.address.toLowerCase() === token.address.toLowerCase(),
       );
-      if (isAlreadyFetched && !isNative) {
+      if (isAlreadyFetched) {
         // ERC20 on insight-enabled chain already handled by insight call
         continue;
       }
@@ -222,7 +246,7 @@ async function fetchBalancesForWallet({
             }
           } catch (err) {
             console.warn(
-              `Failed to fetch balance for ${token.symbol} on chain ${chainId}`,
+              `Failed to fetch RPC balance for ${token.symbol} on chain ${chainId}`,
               err,
             );
           }