fix: wallet aggregation bug (#346)

tien · Nov 15, 2024 · a3da0de · a3da0de
1 parent 912ecc1
commit a3da0de
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/.changeset/brave-bikes-rescue.md b/.changeset/brave-bikes-rescue.md
@@ -0,0 +1,5 @@
+---
+"@reactive-dot/core": patch
+---
+
+Fixed wallet aggregation bug when aggregation happens asynchronously.
diff --git a/packages/core/src/actions/aggregate-wallets.spec.ts b/packages/core/src/actions/aggregate-wallets.spec.ts
@@ -54,9 +54,10 @@ it("only aggregate once", async () => {
     new MockProvider(),
   ];
 
-  const firstRunWallets = await aggregateWallets(walletsAndProviders);
-
-  const secondRunWallets = await aggregateWallets(walletsAndProviders);
+  const [firstRunWallets, secondRunWallets] = await Promise.all([
+    aggregateWallets(walletsAndProviders),
+    aggregateWallets(walletsAndProviders),
+  ]);
 
   expect(firstRunWallets).toHaveLength(secondRunWallets.length);
 

diff --git a/packages/core/src/actions/aggregate-wallets.ts b/packages/core/src/actions/aggregate-wallets.ts
@@ -1,6 +1,9 @@
 import { Wallet, type WalletProvider } from "../wallets/index.js";
 
-const providerWallets = new WeakMap<WalletProvider, readonly Wallet[]>();
+const providerWallets = new WeakMap<
+  WalletProvider,
+  Promise<readonly Wallet[]>
+>();
 
 export function aggregateWallets(
   providersOrWallets: ReadonlyArray<Wallet | WalletProvider>,
@@ -9,11 +12,13 @@ export function aggregateWallets(
     providersOrWallets.map((walletOrProvider) =>
       walletOrProvider instanceof Wallet
         ? [walletOrProvider]
-        : (async () =>
-            providerWallets.get(walletOrProvider) ??
-            providerWallets
-              .set(walletOrProvider, await walletOrProvider.getWallets())
-              .get(walletOrProvider)!)(),
+        : (providerWallets.get(walletOrProvider) ??
+          providerWallets
+            .set(
+              walletOrProvider,
+              Promise.resolve(walletOrProvider.getWallets()),
+            )
+            .get(walletOrProvider)!),
     ),
   ).then((wallets) => wallets.flat());
 }