- Cache resolved virtual wallets

packages/core/src/main.ts

@@ -10,7 +10,10 @@ import {
 } from "./wallet/isWalletObject"
 import { scanObjectForWallets } from "./wallet/scan"
 import { sortBy } from "./wallet/sort"
-import { initiateVirtualWallets } from "./wallet/virtualWallets"
+import {
+  initiateVirtualWallets,
+  resolveVirtualWallet,
+} from "./wallet/virtualWallets"
 import { Permission, type StarknetWindowObject } from "starknet-types"
 
 export type {
@@ -118,7 +121,7 @@ export function getStarknet(
     enable: async (inputWallet, options) => {
       let wallet: StarknetWindowObject
       if (isVirtualWallet(inputWallet)) {
-        wallet = await inputWallet.loadWallet()
+        wallet = await resolveVirtualWallet(inputWallet)
       } else if (isFullWallet(inputWallet)) {
         wallet = inputWallet
       } else {

packages/core/src/wallet/virtualWallets/index.ts

@@ -1,17 +1,28 @@
-import type { VirtualWallet } from "../../types";
-import { metaMaskVirtualWallet } from "./metaMaskVirtualWallet";
+import type { StarknetWindowObject } from "starknet-types"
+import type { VirtualWallet } from "../../types"
+import { metaMaskVirtualWallet } from "./metaMaskVirtualWallet"
 
-const virtualWallets: VirtualWallet[] = [
-    metaMaskVirtualWallet
-];
+const virtualWallets: VirtualWallet[] = [metaMaskVirtualWallet]
 
 function initiateVirtualWallets() {
-    virtualWallets.forEach(async virtualWallet => {
-        const hasSupport = await virtualWallet.hasSupport()
-        if (hasSupport) {
-            window[virtualWallet.windowKey] = virtualWallet;
-        }
-    });
+  virtualWallets.forEach(async (virtualWallet) => {
+    const hasSupport = await virtualWallet.hasSupport()
+    if (hasSupport) {
+      window[virtualWallet.windowKey] = virtualWallet
+    }
+  })
 }
 
-export { initiateVirtualWallets, }
+const virtualWalletsMap: Record<string, StarknetWindowObject> = {}
+
+async function resolveVirtualWallet(virtualWallet: VirtualWallet) {
+  let wallet: StarknetWindowObject = virtualWalletsMap[virtualWallet.id]
+  if (!wallet) {
+    wallet = await virtualWallet.loadWallet()
+    virtualWalletsMap[virtualWallet.id] = wallet
+  }
+
+  return wallet
+}
+
+export { initiateVirtualWallets, resolveVirtualWallet }