try to check foreign asset cache concurrently

wormhole-foundation · Oct 15, 2023 · be30b43 · be30b43
1 parent 6b0dde3
commit be30b43
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 33 deletions.
diff --git a/core/tokenRegistry/src/foreignAssets.ts b/core/tokenRegistry/src/foreignAssets.ts
@@ -19,7 +19,7 @@ console.warn = function (x: any, ...rest: any) {
 };
 
 import { ChainName, chains } from "@wormhole-foundation/sdk-base";
-import { ForeignAssetsCache, TokensConfig } from "./types";
+import { ForeignAssetsCache, TokenEntries, TokensConfig } from "./types";
 import { TokenId, Wormhole, toNative } from "@wormhole-foundation/connect-sdk";
 
 // TODO: Question: How do we handle if a user tries to perform an action for a chain/platform which isn't installed??
@@ -124,45 +124,72 @@ export const getForeignAssetsData = async (
   return updates;
 };
 
+type MaybeUpdate = [ChainName, string, ForeignAssetsCache | undefined];
+
+export const getForeignAssetsDataForChain = async (
+  wh: Wormhole,
+  chain: ChainName,
+  chainTokensConfig: TokenEntries,
+) => {
+  const maybeUpdates: MaybeUpdate[] = [];
+  for (const [token, config] of Object.entries(chainTokensConfig)) {
+    const tokenId = createTokenId(chain as ChainName, token);
+    if (!tokenId) continue;
+
+    maybeUpdates.push([
+      chain as ChainName,
+      token,
+      await getForeignAssetsData(
+        wh,
+        chain as ChainName,
+        tokenId,
+        config.foreignAssets,
+      ),
+    ]);
+  }
+  return maybeUpdates;
+};
+
 export const getSuggestedUpdates = async (
   wh: Wormhole,
   tokensConfig: TokensConfig,
 ) => {
   let suggestedUpdates: TokensConfig = {};
   let numUpdates = 0;
 
+  const maybeUpdatePromises: Promise<MaybeUpdate[]>[] = [];
+
   for (const [chain, chainTokensConfig] of Object.entries(tokensConfig)) {
-    for (const [token, config] of Object.entries(chainTokensConfig)) {
-      const tokenId = createTokenId(chain as ChainName, token);
-      const updates = await getForeignAssetsData(
-        wh,
-        chain as ChainName,
-        tokenId,
-        config.foreignAssets,
-      );
-      if (updates && Object.values(updates).length > 0) {
-        numUpdates += Object.values(updates).length;
-        suggestedUpdates = {
-          ...suggestedUpdates,
-          [chain]: {
-            ...(suggestedUpdates[chain as ChainName] || {}),
-            [token]: {
-              ...(suggestedUpdates[chain as ChainName]
-                ? suggestedUpdates[chain as ChainName]![token] || {}
+    maybeUpdatePromises.push(
+      getForeignAssetsDataForChain(wh, chain as ChainName, chainTokensConfig),
+    );
+  }
+
+  const maybeUpdates = (await Promise.all(maybeUpdatePromises)).flat();
+
+  for (const [chain, token, updates] of maybeUpdates) {
+    if (updates && Object.values(updates).length > 0) {
+      numUpdates += Object.values(updates).length;
+
+      suggestedUpdates = {
+        ...suggestedUpdates,
+        [chain]: {
+          ...(suggestedUpdates[chain] || {}),
+          [token]: {
+            ...(suggestedUpdates[chain]
+              ? suggestedUpdates[chain]![token] || {}
+              : {}),
+            foreignAssets: {
+              ...(suggestedUpdates[chain]
+                ? suggestedUpdates[chain]![token]
+                  ? suggestedUpdates[chain]![token]!.foreignAssets
+                  : {}
                 : {}),
-              foreignAssets: {
-                ...(suggestedUpdates[chain as ChainName]
-                  ? suggestedUpdates[chain as ChainName]![token]
-                    ? suggestedUpdates[chain as ChainName]![token]!
-                        .foreignAssets
-                    : {}
-                  : {}),
-                ...updates,
-              },
+              ...updates,
             },
           },
-        };
-      }
+        },
+      };
     }
   }
   // console.log(`${numUpdates} updates available`);

diff --git a/core/tokenRegistry/src/types.ts b/core/tokenRegistry/src/types.ts
@@ -15,6 +15,11 @@ export type TokenConfig = {
   decimals: number;
   foreignAssets?: ForeignAssetsCache;
 };
+
+export type TokenEntries = {
+  [key: string]: TokenConfig;
+};
+
 export type TokensConfig = {
-  [chain in ChainName]?: { [key: string]: TokenConfig };
+  [chain in ChainName]?: TokenEntries;
 };
diff --git a/platforms/solana/src/platformUtils.ts b/platforms/solana/src/platformUtils.ts
@@ -11,7 +11,7 @@ import {
   chainToPlatform,
   UniversalOrNative,
 } from '@wormhole-foundation/connect-sdk';
-import { Connection, PublicKey } from '@solana/web3.js';
+import { Connection, ParsedAccountData, PublicKey } from '@solana/web3.js';
 import { solGenesisHashToNetworkChainPair } from './constants';
 import { SolanaPlatform } from './platform';
 import { SolanaAddress, SolanaZeroAddress } from './address';
@@ -53,8 +53,10 @@ export module SolanaUtils {
     let mint = await rpc.getParsedAccountInfo(
       new PublicKey(token.toUint8Array()),
     );
-    if (!mint) throw new Error('could not fetch token details');
-    const { decimals } = (mint as any).value.data.parsed.info;
+
+    if (!mint || !mint.value) throw new Error('could not fetch token details');
+
+    const { decimals } = (mint.value.data as ParsedAccountData).parsed.info;
     return decimals;
   }