@bit-buccaneers/wallet-abstraction 0.0.25 → 0.0.30

package/dist/dev.js

@@ -1,5 +1,5 @@
 import { injected, metaMask, coinbaseWallet } from '@wagmi/connectors';
-import { createConfig, getConnectors, signMessage, disconnect, connect, watchConnections, switchChain as switchChain$1, sendTransaction as sendTransaction$1, waitForTransactionReceipt as waitForTransactionReceipt$1, readContract, writeContract } from '@wagmi/core';
+import { createConfig, getConnectors, signMessage, connect, disconnect, watchConnections, switchChain as switchChain$1, sendTransaction as sendTransaction$1, waitForTransactionReceipt as waitForTransactionReceipt$1, readContract, writeContract } from '@wagmi/core';
 import { http, erc20Abi } from 'viem';
 import { mainnet } from 'viem/chains';
 import bs582 from 'bs58';
@@ -232,7 +232,15 @@ var isMobile = () => {
   return typeof window !== "undefined" && /iPhone|iPad|iPod|Android/i.test(window.navigator.userAgent);
 };
 var isInWalletBrowser = (key) => {
-  return typeof window !== "undefined" && !!window.ethereum?.[key];
+  if (typeof window === "undefined") return false;
+  const ethereum = window.ethereum;
+  const providers = ethereum?.providers ?? (ethereum ? [ethereum] : []);
+  if (key === "isMetaMask") {
+    return providers.some(
+      (provider) => !!provider.isMetaMask && !provider.isBraveWallet && !provider.isOkxWallet && !provider.isRabby
+    );
+  }
+  return providers.some((provider) => !!provider[key]);
 };
 var openDeeplink = (url) => {
   const link = document.createElement("a");
@@ -1307,10 +1315,28 @@ var checkEvmWalletInstalled = (connectorId) => {
   }
 };
 var cleanupWalletLocalStorage = () => {
-  Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
+  const prefixes = ["wagmi.", "@metamask/", "MMSDK_"];
+  Object.keys(window.localStorage).filter((key) => prefixes.some((p) => key.startsWith(p))).forEach((key) => window.localStorage.removeItem(key));
+};
+var disconnectAllEvmConnections = async () => {
+  const config2 = getEvmConfig();
+  const connections = [...config2.state.connections.values()];
+  for (const connection of connections) {
+    await disconnect(config2, { connector: connection.connector });
+  }
+  const shimKeys = [];
+  for (const connector of config2.connectors) {
+    await config2.storage?.setItem(`${connector.id}.disconnected`, true);
+    shimKeys.push(`wagmi.${connector.id}.disconnected`);
+  }
+  cleanupWalletLocalStorage();
+  for (const key of shimKeys) {
+    window.localStorage.setItem(key, JSON.stringify(true));
+  }
 };
+var EVM_EXCLUDED_RDNS = /* @__PURE__ */ new Set(["app.solflare"]);
 var getEvmConnectors = () => {
-  const wagmiConnectors = getConnectors(getEvmConfig());
+  const wagmiConnectors = getConnectors(getEvmConfig()).filter((c) => !EVM_EXCLUDED_RDNS.has(c.id));
   const connectors = wagmiConnectors.map((c) => ({
     id: normalizeEvmWalletId(c.id),
     name: c.name,
@@ -1327,7 +1353,6 @@ var getEvmConnectors = () => {
         } catch (err) {
           if (err instanceof Error && err.name === "ConnectorAlreadyConnectedError") {
             await disconnect(getEvmConfig(), { connector: c });
-            cleanupWalletLocalStorage();
             await sleep(100);
             const result = await connect(getEvmConfig(), { connector: c });
             if (!result.accounts[0]) throw new Error("No accounts returned");
@@ -1337,8 +1362,7 @@ var getEvmConnectors = () => {
         }
       },
       disconnect: async () => {
-        await disconnect(getEvmConfig());
-        cleanupWalletLocalStorage();
+        await disconnectAllEvmConnections();
       },
       signMessage: async (message) => {
         return signMessage(getEvmConfig(), { message });

package/dist/dev.jsx

@@ -229,7 +229,15 @@ var isMobile = () => {
   return typeof window !== "undefined" && /iPhone|iPad|iPod|Android/i.test(window.navigator.userAgent);
 };
 var isInWalletBrowser = (key) => {
-  return typeof window !== "undefined" && !!window.ethereum?.[key];
+  if (typeof window === "undefined") return false;
+  const ethereum = window.ethereum;
+  const providers = ethereum?.providers ?? (ethereum ? [ethereum] : []);
+  if (key === "isMetaMask") {
+    return providers.some(
+      (provider) => !!provider.isMetaMask && !provider.isBraveWallet && !provider.isOkxWallet && !provider.isRabby
+    );
+  }
+  return providers.some((provider) => !!provider[key]);
 };
 var openDeeplink = (url) => {
   const link = document.createElement("a");
@@ -1331,10 +1339,28 @@ var checkEvmWalletInstalled = (connectorId) => {
   }
 };
 var cleanupWalletLocalStorage = () => {
-  Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
+  const prefixes = ["wagmi.", "@metamask/", "MMSDK_"];
+  Object.keys(window.localStorage).filter((key) => prefixes.some((p) => key.startsWith(p))).forEach((key) => window.localStorage.removeItem(key));
+};
+var disconnectAllEvmConnections = async () => {
+  const config2 = getEvmConfig();
+  const connections = [...config2.state.connections.values()];
+  for (const connection of connections) {
+    await disconnect(config2, { connector: connection.connector });
+  }
+  const shimKeys = [];
+  for (const connector of config2.connectors) {
+    await config2.storage?.setItem(`${connector.id}.disconnected`, true);
+    shimKeys.push(`wagmi.${connector.id}.disconnected`);
+  }
+  cleanupWalletLocalStorage();
+  for (const key of shimKeys) {
+    window.localStorage.setItem(key, JSON.stringify(true));
+  }
 };
+var EVM_EXCLUDED_RDNS = /* @__PURE__ */ new Set(["app.solflare"]);
 var getEvmConnectors = () => {
-  const wagmiConnectors = getConnectors(getEvmConfig());
+  const wagmiConnectors = getConnectors(getEvmConfig()).filter((c) => !EVM_EXCLUDED_RDNS.has(c.id));
   const connectors = wagmiConnectors.map((c) => ({
     id: normalizeEvmWalletId(c.id),
     name: c.name,
@@ -1351,7 +1377,6 @@ var getEvmConnectors = () => {
         } catch (err) {
           if (err instanceof Error && err.name === "ConnectorAlreadyConnectedError") {
             await disconnect(getEvmConfig(), { connector: c });
-            cleanupWalletLocalStorage();
             await sleep(100);
             const result = await connect(getEvmConfig(), { connector: c });
             if (!result.accounts[0]) throw new Error("No accounts returned");
@@ -1361,8 +1386,7 @@ var getEvmConnectors = () => {
         }
       },
       disconnect: async () => {
-        await disconnect(getEvmConfig());
-        cleanupWalletLocalStorage();
+        await disconnectAllEvmConnections();
       },
       signMessage: async (message) => {
         return wagmiSignMessage(getEvmConfig(), { message });

package/dist/index.js

@@ -1,5 +1,5 @@
 import { injected, metaMask, coinbaseWallet } from '@wagmi/connectors';
-import { createConfig, getConnectors, signMessage, disconnect, connect, watchConnections, switchChain as switchChain$1, sendTransaction as sendTransaction$1, waitForTransactionReceipt as waitForTransactionReceipt$1, readContract, writeContract } from '@wagmi/core';
+import { createConfig, getConnectors, signMessage, connect, disconnect, watchConnections, switchChain as switchChain$1, sendTransaction as sendTransaction$1, waitForTransactionReceipt as waitForTransactionReceipt$1, readContract, writeContract } from '@wagmi/core';
 import { http, erc20Abi } from 'viem';
 import { mainnet } from 'viem/chains';
 import bs582 from 'bs58';
@@ -232,7 +232,15 @@ var isMobile = () => {
   return typeof window !== "undefined" && /iPhone|iPad|iPod|Android/i.test(window.navigator.userAgent);
 };
 var isInWalletBrowser = (key) => {
-  return typeof window !== "undefined" && !!window.ethereum?.[key];
+  if (typeof window === "undefined") return false;
+  const ethereum = window.ethereum;
+  const providers = ethereum?.providers ?? (ethereum ? [ethereum] : []);
+  if (key === "isMetaMask") {
+    return providers.some(
+      (provider) => !!provider.isMetaMask && !provider.isBraveWallet && !provider.isOkxWallet && !provider.isRabby
+    );
+  }
+  return providers.some((provider) => !!provider[key]);
 };
 var openDeeplink = (url) => {
   const link = document.createElement("a");
@@ -1307,10 +1315,28 @@ var checkEvmWalletInstalled = (connectorId) => {
   }
 };
 var cleanupWalletLocalStorage = () => {
-  Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
+  const prefixes = ["wagmi.", "@metamask/", "MMSDK_"];
+  Object.keys(window.localStorage).filter((key) => prefixes.some((p) => key.startsWith(p))).forEach((key) => window.localStorage.removeItem(key));
+};
+var disconnectAllEvmConnections = async () => {
+  const config2 = getEvmConfig();
+  const connections = [...config2.state.connections.values()];
+  for (const connection of connections) {
+    await disconnect(config2, { connector: connection.connector });
+  }
+  const shimKeys = [];
+  for (const connector of config2.connectors) {
+    await config2.storage?.setItem(`${connector.id}.disconnected`, true);
+    shimKeys.push(`wagmi.${connector.id}.disconnected`);
+  }
+  cleanupWalletLocalStorage();
+  for (const key of shimKeys) {
+    window.localStorage.setItem(key, JSON.stringify(true));
+  }
 };
+var EVM_EXCLUDED_RDNS = /* @__PURE__ */ new Set(["app.solflare"]);
 var getEvmConnectors = () => {
-  const wagmiConnectors = getConnectors(getEvmConfig());
+  const wagmiConnectors = getConnectors(getEvmConfig()).filter((c) => !EVM_EXCLUDED_RDNS.has(c.id));
   const connectors = wagmiConnectors.map((c) => ({
     id: normalizeEvmWalletId(c.id),
     name: c.name,
@@ -1327,7 +1353,6 @@ var getEvmConnectors = () => {
         } catch (err) {
           if (err instanceof Error && err.name === "ConnectorAlreadyConnectedError") {
             await disconnect(getEvmConfig(), { connector: c });
-            cleanupWalletLocalStorage();
             await sleep(100);
             const result = await connect(getEvmConfig(), { connector: c });
             if (!result.accounts[0]) throw new Error("No accounts returned");
@@ -1337,8 +1362,7 @@ var getEvmConnectors = () => {
         }
       },
       disconnect: async () => {
-        await disconnect(getEvmConfig());
-        cleanupWalletLocalStorage();
+        await disconnectAllEvmConnections();
       },
       signMessage: async (message) => {
         return signMessage(getEvmConfig(), { message });

package/dist/index.jsx

@@ -229,7 +229,15 @@ var isMobile = () => {
   return typeof window !== "undefined" && /iPhone|iPad|iPod|Android/i.test(window.navigator.userAgent);
 };
 var isInWalletBrowser = (key) => {
-  return typeof window !== "undefined" && !!window.ethereum?.[key];
+  if (typeof window === "undefined") return false;
+  const ethereum = window.ethereum;
+  const providers = ethereum?.providers ?? (ethereum ? [ethereum] : []);
+  if (key === "isMetaMask") {
+    return providers.some(
+      (provider) => !!provider.isMetaMask && !provider.isBraveWallet && !provider.isOkxWallet && !provider.isRabby
+    );
+  }
+  return providers.some((provider) => !!provider[key]);
 };
 var openDeeplink = (url) => {
   const link = document.createElement("a");
@@ -1331,10 +1339,28 @@ var checkEvmWalletInstalled = (connectorId) => {
   }
 };
 var cleanupWalletLocalStorage = () => {
-  Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
+  const prefixes = ["wagmi.", "@metamask/", "MMSDK_"];
+  Object.keys(window.localStorage).filter((key) => prefixes.some((p) => key.startsWith(p))).forEach((key) => window.localStorage.removeItem(key));
+};
+var disconnectAllEvmConnections = async () => {
+  const config2 = getEvmConfig();
+  const connections = [...config2.state.connections.values()];
+  for (const connection of connections) {
+    await disconnect(config2, { connector: connection.connector });
+  }
+  const shimKeys = [];
+  for (const connector of config2.connectors) {
+    await config2.storage?.setItem(`${connector.id}.disconnected`, true);
+    shimKeys.push(`wagmi.${connector.id}.disconnected`);
+  }
+  cleanupWalletLocalStorage();
+  for (const key of shimKeys) {
+    window.localStorage.setItem(key, JSON.stringify(true));
+  }
 };
+var EVM_EXCLUDED_RDNS = /* @__PURE__ */ new Set(["app.solflare"]);
 var getEvmConnectors = () => {
-  const wagmiConnectors = getConnectors(getEvmConfig());
+  const wagmiConnectors = getConnectors(getEvmConfig()).filter((c) => !EVM_EXCLUDED_RDNS.has(c.id));
   const connectors = wagmiConnectors.map((c) => ({
     id: normalizeEvmWalletId(c.id),
     name: c.name,
@@ -1351,7 +1377,6 @@ var getEvmConnectors = () => {
         } catch (err) {
           if (err instanceof Error && err.name === "ConnectorAlreadyConnectedError") {
             await disconnect(getEvmConfig(), { connector: c });
-            cleanupWalletLocalStorage();
             await sleep(100);
             const result = await connect(getEvmConfig(), { connector: c });
             if (!result.accounts[0]) throw new Error("No accounts returned");
@@ -1361,8 +1386,7 @@ var getEvmConnectors = () => {
         }
       },
       disconnect: async () => {
-        await disconnect(getEvmConfig());
-        cleanupWalletLocalStorage();
+        await disconnectAllEvmConnections();
       },
       signMessage: async (message) => {
         return wagmiSignMessage(getEvmConfig(), { message });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-buccaneers/wallet-abstraction",
-  "version": "0.0.25",
+  "version": "0.0.30",
   "description": "Solid.js web3 wallet abstraction for EVM and Solana",
   "license": "MIT",
   "author": "Bit Buccaneers",