lint

Author: joaquim-verges

packages/thirdweb/src/bridge/Routes.ts

@@ -131,7 +131,7 @@ export async function routes(options: routes.Options): Promise<routes.Result> {
     sortBy,
     limit,
     offset,
-    includePrices,  
+    includePrices,
     chainIds,
   } = options;
 

packages/thirdweb/src/chains/utils.ts

@@ -40,7 +40,7 @@ export const CUSTOM_CHAIN_MAP = new Map<number, Chain>();
  * @chain
  */
 export function defineChain(
-  options: number | ChainOptions | ViemChain | LegacyChain
+  options: number | ChainOptions | ViemChain | LegacyChain,
 ): Chain {
   const RPC_URL = getThirdwebDomains().rpc;
   if (typeof options === "number") {
@@ -97,7 +97,7 @@ export function getCachedChainIfExists(id: number) {
 }
 
 function isLegacyChain(
-  chain: ChainOptions | ViemChain | LegacyChain
+  chain: ChainOptions | ViemChain | LegacyChain,
 ): chain is LegacyChain {
   return "rpc" in chain && Array.isArray(chain.rpc) && "slug" in chain;
 }
@@ -128,7 +128,7 @@ export function convertLegacyChain(legacyChain: LegacyChain): Chain {
 }
 
 function isViemChain(
-  chain: ChainOptions | ViemChain | LegacyChain
+  chain: ChainOptions | ViemChain | LegacyChain,
 ): chain is ViemChain {
   return "rpcUrls" in chain && !("rpc" in chain);
 }
@@ -192,7 +192,7 @@ export function getRpcUrlForChain(options: GetRpcUrlForChainOptions): string {
   // add on the client ID to the RPC URL if it's a thirdweb URL
   if (isThirdwebUrl(rpc)) {
     const rpcUrl = new URL(
-      options.chain.rpc.replace(DEFAULT_RPC_URL, baseRpcUrl)
+      options.chain.rpc.replace(DEFAULT_RPC_URL, baseRpcUrl),
     );
     if (rpcUrl.pathname === "/" || rpcUrl.pathname.startsWith("/$")) {
       rpcUrl.pathname = `/${options.client.clientId}`;
@@ -250,7 +250,7 @@ export async function getChainDecimals(chain: Chain): Promise<number> {
  * @internal
  */
 export async function getChainNativeCurrencyName(
-  chain: Chain
+  chain: Chain,
 ): Promise<string> {
   if (!chain.nativeCurrency?.name) {
     return getChainMetadata(chain)
@@ -293,11 +293,11 @@ export function getChainMetadata(chain: Chain): Promise<ChainMetadata> {
     async () => {
       try {
         const res = await fetch(
-          `https://api.thirdweb.com/v1/chains/${chainId}`
+          `https://api.thirdweb.com/v1/chains/${chainId}`,
         );
         if (!res.ok) {
           throw new Error(
-            `Failed to fetch chain data for chainId ${chainId}. ${res.status} ${res.statusText}`
+            `Failed to fetch chain data for chainId ${chainId}. ${res.status} ${res.statusText}`,
           );
         }
 
@@ -319,7 +319,7 @@ export function getChainMetadata(chain: Chain): Promise<ChainMetadata> {
     {
       cacheKey: `chain:${chainId}`,
       cacheTime: 5 * 60 * 1000, // 5 minutes
-    }
+    },
   );
 }
 
@@ -354,11 +354,11 @@ export function getChainServices(chain: Chain): Promise<ChainService[]> {
     async () => {
       try {
         const res = await fetch(
-          `https://api.thirdweb.com/v1/chains/${chainId}/services`
+          `https://api.thirdweb.com/v1/chains/${chainId}/services`,
         );
         if (!res.ok) {
           throw new Error(
-            `Failed to fetch services for chainId ${chainId}. ${res.status} ${res.statusText}`
+            `Failed to fetch services for chainId ${chainId}. ${res.status} ${res.statusText}`,
           );
         }
 
@@ -380,19 +380,19 @@ export function getChainServices(chain: Chain): Promise<ChainService[]> {
     {
       cacheKey: `chain:${chainId}:services`,
       cacheTime: 24 * 60 * 60 * 1000, // 1 day
-    }
+    },
   );
 }
 
 export async function getInsightEnabledChainIds(): Promise<number[]> {
   return withCache(
     async () => {
       const res = await fetch(
-        `https://api.thirdweb.com/v1/chains/services?service=insight`
+        `https://api.thirdweb.com/v1/chains/services?service=insight`,
       );
       if (!res.ok) {
         throw new Error(
-          `Failed to fetch services. ${res.status} ${res.statusText}`
+          `Failed to fetch services. ${res.status} ${res.statusText}`,
         );
       }
       const response = (await res.json()) as { data: Record<number, boolean> };
@@ -401,7 +401,7 @@ export async function getInsightEnabledChainIds(): Promise<number[]> {
     {
       cacheKey: `chain:insight-enabled`,
       cacheTime: 24 * 60 * 60 * 1000, // 1 day
-    }
+    },
   );
 }
 
@@ -430,7 +430,7 @@ export function convertApiChainToChain(apiChain: ChainMetadata): Chain {
 
 function createChainMetadata(
   chain: Chain,
-  data?: ChainMetadata
+  data?: ChainMetadata,
 ): ChainMetadata {
   const nativeCurrency = chain.nativeCurrency
     ? {

packages/thirdweb/src/insight/common.ts

@@ -2,7 +2,7 @@ import type { Chain } from "../chains/types.js";
 import { getInsightEnabledChainIds } from "../chains/utils.js";
 
 export async function assertInsightEnabled(chains: Chain[]) {
-  const chainIds = await getInsightEnabledChainIds(); 
+  const chainIds = await getInsightEnabledChainIds();
   const insightEnabled = chains.every((c) => chainIds.includes(c.id));
 
   if (!insightEnabled) {

packages/thirdweb/src/react/core/hooks/usePaymentMethods.ts

@@ -2,7 +2,10 @@ import { useQuery } from "@tanstack/react-query";
 import { chains } from "../../../bridge/Chains.js";
 import { routes } from "../../../bridge/Routes.js";
 import type { Token } from "../../../bridge/types/Token.js";
-import { getCachedChain, getInsightEnabledChainIds } from "../../../chains/utils.js";
+import {
+  getCachedChain,
+  getInsightEnabledChainIds,
+} from "../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../client/client.js";
 import { getOwnedTokens } from "../../../insight/get-tokens.js";
 import { toTokens } from "../../../utils/units.js";
@@ -58,10 +61,15 @@ export function usePaymentMethods(options: {
       }
 
       // 1. Get all supported chains
-      const [allChains, insightEnabledChainIds] = await Promise.all([chains({ client }), getInsightEnabledChainIds()]);
+      const [allChains, insightEnabledChainIds] = await Promise.all([
+        chains({ client }),
+        getInsightEnabledChainIds(),
+      ]);
 
       // 2. Check insight availability for all chains
-      const insightEnabledChains = allChains.filter((c) => insightEnabledChainIds.includes(c.chainId));
+      const insightEnabledChains = allChains.filter((c) =>
+        insightEnabledChainIds.includes(c.chainId),
+      );
 
       // 3. Get all owned tokens for insight-enabled chains
       let allOwnedTokens: Array<{
@@ -120,36 +128,21 @@ export function usePaymentMethods(options: {
         allValidOriginTokens.set(tokenKey, destinationToken);
       }
 
-      // const routesForChain = await routes({
-      //   client,
-      //   destinationChainId: destinationToken.chainId,
-      //   destinationTokenAddress: destinationToken.address,
-      //   includePrices: true,
-      //   limit: 1000,
-      //   maxSteps: 3,
-      //   sortBy: "popularity",
-      //   chainIds: chainsWithOwnedTokens,
-      // });
-
-      // for (const route of routesForChain) {
-      //   const tokenKey = `${route.originToken.chainId}-${route.originToken.address.toLowerCase()}`;
-      //   allValidOriginTokens.set(tokenKey, route.originToken);
-      // }
-
       // Fetch routes for each chain with owned tokens
       await Promise.all(
         chainsWithOwnedTokens.map(async (chainId) => {
           try {
+            // TODO (bridge): this is quite inefficient, need to fix the popularity sorting to really capture all users tokens
             const routesForChain = await routes({
+              chainIds: chainsWithOwnedTokens,
               client,
               destinationChainId: destinationToken.chainId,
               destinationTokenAddress: destinationToken.address,
-              originChainId: chainId,
               includePrices: true,
               limit: 100,
               maxSteps: 3,
+              originChainId: chainId,
               sortBy: "popularity",
-              chainIds: chainsWithOwnedTokens,
             });
 
             // Add all origin tokens from this chain's routes