@bit-buccaneers/wallet-abstraction 0.0.8 → 0.0.10

package/dist/dev.js

@@ -1,5 +1,5 @@
 import { injected, metaMask, coinbaseWallet } from '@wagmi/connectors';
-import { createConfig, getConnectors, signMessage, disconnect, connect, watchConnections } from '@wagmi/core';
+import { createConfig, getConnectors, signMessage, disconnect, getConnections, connect, watchConnections } from '@wagmi/core';
 import { http } from 'viem';
 import { mainnet } from 'viem/chains';
 import bs582 from 'bs58';
@@ -174,7 +174,7 @@ var EVM_WALLET_ID_MAP = {
   coinbaseWalletSDK: "coinbase",
   "io.rabby": "rabby",
   "me.rainbow": "rainbow",
-  "com.exodus.wallet": "exodus",
+  "com.exodus.web3-wallet": "exodus",
   walletConnect: "walletconnect"
 };
 var SOLANA_WALLET_ID_MAP = {
@@ -810,10 +810,12 @@ var createMetaMaskSolanaDappBrowserConnector = () => createDappBrowserSolanaConn
 // src/lib/connectors/solflare.ts
 var SOLFLARE_CONNECT_URL = "https://solflare.com/ul/v1/connect";
 var SOLFLARE_SIGN_MESSAGE_URL = "https://solflare.com/ul/v1/signMessage";
-var SOLFLARE_BROWSE_URL = "https://solflare.com/ul/v1/browse";
+var buildSolflareBrowseUrl = () => `https://solflare.com/ul/v1/browse/${encodeURIComponent(
+  window.location.href
+)}?ref=${encodeURIComponent(window.location.origin)}`;
 var createSolflareSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "solflare",
-  browseUrl: SOLFLARE_BROWSE_URL,
+  buildUrl: buildSolflareBrowseUrl,
   injectedKey: "isSolflare"
 });
 var SOLFLARE_CONFIG = {
@@ -885,12 +887,12 @@ var TRUST_CONFIG = {
   wcDeeplink: "https://link.trustwallet.com/wc",
   injectedKey: "isTrust"
 };
-var TRUST_BROWSE_URL = "https://link.trustwallet.com/open_url";
+var buildTrustBrowseUrl = () => `https://link.trustwallet.com/open_url?url=${encodeURIComponent(window.location.href)}`;
 var createTrustEvmMobileConnector = () => createWcEvmConnector(TRUST_CONFIG);
 var createTrustSolanaMobileConnector = () => createWcSolanaConnector(TRUST_CONFIG);
 var createTrustSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "trust",
-  browseUrl: TRUST_BROWSE_URL,
+  buildUrl: buildTrustBrowseUrl,
   injectedKey: "isTrust"
 });
 
@@ -908,14 +910,8 @@ var EXODUS_CONFIG = {
   wcDeeplink: "https://exodus.com/wc",
   injectedKey: "isExodus"
 };
-var EXODUS_BROWSE_URL = "https://exodus.com/m/browser";
 var createExodusEvmMobileConnector = () => createWcEvmConnector(EXODUS_CONFIG);
 var createExodusSolanaMobileConnector = () => createWcSolanaConnector(EXODUS_CONFIG);
-var createExodusSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
-  walletId: "exodus",
-  browseUrl: EXODUS_BROWSE_URL,
-  injectedKey: "isExodus"
-});
 
 // src/lib/connectors/binance.ts
 var BINANCE_CONFIG = {
@@ -953,12 +949,17 @@ var createCoinbaseSolanaDappBrowserConnector = () => createDappBrowserSolanaConn
 });
 
 // src/lib/connectors/bitget.ts
-var BITGET_BROWSE_URL = "https://bkcode.vip/dapp";
+var BITGET_CONFIG = {
+  walletId: "bitget",
+  wcDeeplink: "bitkeep://bkconnect",
+  injectedKey: "isBitKeep"
+};
+var buildBitgetBrowseUrl = () => `https://bkcode.vip?action=dapp&url=${encodeURIComponent(window.location.href)}`;
+var createBitgetSolanaConnector = () => createWcSolanaConnector(BITGET_CONFIG);
 var createBitgetSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "bitget",
-  browseUrl: BITGET_BROWSE_URL,
   injectedKey: "isBitKeep",
-  stripProtocol: true
+  buildUrl: buildBitgetBrowseUrl
 });
 var walletConfig = WALLETS.find((w) => w.id === "walletconnect");
 var disconnectWc2 = async () => {
@@ -1045,6 +1046,9 @@ var EVM_FALLBACK_CONNECTORS = [
   { id: "rainbow", create: createRainbowEvmMobileConnector },
   { id: "exodus", create: createExodusEvmMobileConnector }
 ];
+var cleanupWalletLocalStorage = () => {
+  Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
+};
 var getEvmConnectors = () => {
   const wagmiConnectors = getConnectors(getEvmConfig());
   const connectors = wagmiConnectors.map((c) => ({
@@ -1056,11 +1060,14 @@ var getEvmConnectors = () => {
     wallet: {
       _connector: c,
       connect: async () => {
+        const connections = getConnections(getEvmConfig());
+        if (connections.length > 0) await disconnect(getEvmConfig());
         const result = await connect(getEvmConfig(), { connector: c });
         if (!result.accounts[0]) throw new Error("No accounts returned");
         return connectedResult(result.accounts[0], { chainId: result.chainId });
       },
       disconnect: async () => {
+        cleanupWalletLocalStorage();
         await disconnect(getEvmConfig());
       },
       signMessage: async (message) => {
@@ -1190,11 +1197,10 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
   },
   {
     id: "exodus",
-    create: () => createSolanaMobileConnector(createExodusSolanaDappBrowserConnector())
+    create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector())
   }
 ] : [
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
-  // { id: 'metamask', create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector()) },
   {
     id: "solflare",
     create: () => createSolanaMobileConnector(createSolflareSolanaMobileConnector())
@@ -1204,6 +1210,7 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createTrustSolanaMobileConnector())
   },
   { id: "binance", create: () => createSolanaMobileConnector(createBinanceSolanaConnector()) },
+  { id: "bitget", create: createBitgetSolanaConnector },
   {
     id: "exodus",
     create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector())
@@ -1212,7 +1219,11 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
 var getSolanaWallets = () => {
   const { get } = getWallets();
   const wallets = get();
-  const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => w.constructor.name !== "SolflareMetaMaskWallet").map(createSolanaConnector);
+  const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
+    return w.constructor.name !== "SolflareMetaMaskWallet";
+  }).map(createSolanaConnector);
+  console.log({ wallets });
+  console.log({ connectors });
   addFallbackConnectors(connectors, SOLANA_FALLBACK_CONNECTORS);
   return connectors;
 };

package/dist/dev.jsx

@@ -25,7 +25,13 @@ var getEvmConfig = () => {
 };
 
 // src/lib/evm/connectors.ts
-import { connect, disconnect, getConnectors, signMessage as wagmiSignMessage } from "@wagmi/core";
+import {
+  connect,
+  disconnect,
+  getConnections,
+  getConnectors,
+  signMessage as wagmiSignMessage
+} from "@wagmi/core";
 
 // src/lib/core/constants.ts
 var STORAGE_KEYS = {
@@ -169,7 +175,7 @@ var EVM_WALLET_ID_MAP = {
   coinbaseWalletSDK: "coinbase",
   "io.rabby": "rabby",
   "me.rainbow": "rainbow",
-  "com.exodus.wallet": "exodus",
+  "com.exodus.web3-wallet": "exodus",
   walletConnect: "walletconnect"
 };
 var SOLANA_WALLET_ID_MAP = {
@@ -818,10 +824,12 @@ var createMetaMaskSolanaDappBrowserConnector = () => createDappBrowserSolanaConn
 // src/lib/connectors/solflare.ts
 var SOLFLARE_CONNECT_URL = "https://solflare.com/ul/v1/connect";
 var SOLFLARE_SIGN_MESSAGE_URL = "https://solflare.com/ul/v1/signMessage";
-var SOLFLARE_BROWSE_URL = "https://solflare.com/ul/v1/browse";
+var buildSolflareBrowseUrl = () => `https://solflare.com/ul/v1/browse/${encodeURIComponent(
+  window.location.href
+)}?ref=${encodeURIComponent(window.location.origin)}`;
 var createSolflareSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "solflare",
-  browseUrl: SOLFLARE_BROWSE_URL,
+  buildUrl: buildSolflareBrowseUrl,
   injectedKey: "isSolflare"
 });
 var SOLFLARE_CONFIG = {
@@ -893,12 +901,12 @@ var TRUST_CONFIG = {
   wcDeeplink: "https://link.trustwallet.com/wc",
   injectedKey: "isTrust"
 };
-var TRUST_BROWSE_URL = "https://link.trustwallet.com/open_url";
+var buildTrustBrowseUrl = () => `https://link.trustwallet.com/open_url?url=${encodeURIComponent(window.location.href)}`;
 var createTrustEvmMobileConnector = () => createWcEvmConnector(TRUST_CONFIG);
 var createTrustSolanaMobileConnector = () => createWcSolanaConnector(TRUST_CONFIG);
 var createTrustSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "trust",
-  browseUrl: TRUST_BROWSE_URL,
+  buildUrl: buildTrustBrowseUrl,
   injectedKey: "isTrust"
 });
 
@@ -916,14 +924,8 @@ var EXODUS_CONFIG = {
   wcDeeplink: "https://exodus.com/wc",
   injectedKey: "isExodus"
 };
-var EXODUS_BROWSE_URL = "https://exodus.com/m/browser";
 var createExodusEvmMobileConnector = () => createWcEvmConnector(EXODUS_CONFIG);
 var createExodusSolanaMobileConnector = () => createWcSolanaConnector(EXODUS_CONFIG);
-var createExodusSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
-  walletId: "exodus",
-  browseUrl: EXODUS_BROWSE_URL,
-  injectedKey: "isExodus"
-});
 
 // src/lib/connectors/binance.ts
 var BINANCE_CONFIG = {
@@ -961,12 +963,17 @@ var createCoinbaseSolanaDappBrowserConnector = () => createDappBrowserSolanaConn
 });
 
 // src/lib/connectors/bitget.ts
-var BITGET_BROWSE_URL = "https://bkcode.vip/dapp";
+var BITGET_CONFIG = {
+  walletId: "bitget",
+  wcDeeplink: "bitkeep://bkconnect",
+  injectedKey: "isBitKeep"
+};
+var buildBitgetBrowseUrl = () => `https://bkcode.vip?action=dapp&url=${encodeURIComponent(window.location.href)}`;
+var createBitgetSolanaConnector = () => createWcSolanaConnector(BITGET_CONFIG);
 var createBitgetSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "bitget",
-  browseUrl: BITGET_BROWSE_URL,
   injectedKey: "isBitKeep",
-  stripProtocol: true
+  buildUrl: buildBitgetBrowseUrl
 });
 
 // src/lib/connectors/walletconnect.ts
@@ -1056,6 +1063,9 @@ var EVM_FALLBACK_CONNECTORS = [
   { id: "rainbow", create: createRainbowEvmMobileConnector },
   { id: "exodus", create: createExodusEvmMobileConnector }
 ];
+var cleanupWalletLocalStorage = () => {
+  Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
+};
 var getEvmConnectors = () => {
   const wagmiConnectors = getConnectors(getEvmConfig());
   const connectors = wagmiConnectors.map((c) => ({
@@ -1067,11 +1077,14 @@ var getEvmConnectors = () => {
     wallet: {
       _connector: c,
       connect: async () => {
+        const connections = getConnections(getEvmConfig());
+        if (connections.length > 0) await disconnect(getEvmConfig());
         const result = await connect(getEvmConfig(), { connector: c });
         if (!result.accounts[0]) throw new Error("No accounts returned");
         return connectedResult(result.accounts[0], { chainId: result.chainId });
       },
       disconnect: async () => {
+        cleanupWalletLocalStorage();
         await disconnect(getEvmConfig());
       },
       signMessage: async (message) => {
@@ -1211,11 +1224,10 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
   },
   {
     id: "exodus",
-    create: () => createSolanaMobileConnector(createExodusSolanaDappBrowserConnector())
+    create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector())
   }
 ] : [
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
-  // { id: 'metamask', create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector()) },
   {
     id: "solflare",
     create: () => createSolanaMobileConnector(createSolflareSolanaMobileConnector())
@@ -1225,6 +1237,7 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createTrustSolanaMobileConnector())
   },
   { id: "binance", create: () => createSolanaMobileConnector(createBinanceSolanaConnector()) },
+  { id: "bitget", create: createBitgetSolanaConnector },
   {
     id: "exodus",
     create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector())
@@ -1233,7 +1246,11 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
 var getSolanaWallets = () => {
   const { get } = getWallets();
   const wallets = get();
-  const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => w.constructor.name !== "SolflareMetaMaskWallet").map(createSolanaConnector);
+  const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
+    return w.constructor.name !== "SolflareMetaMaskWallet";
+  }).map(createSolanaConnector);
+  console.log({ wallets });
+  console.log({ connectors });
   addFallbackConnectors(connectors, SOLANA_FALLBACK_CONNECTORS);
   return connectors;
 };

package/dist/index.js

@@ -1,5 +1,5 @@
 import { injected, metaMask, coinbaseWallet } from '@wagmi/connectors';
-import { createConfig, getConnectors, signMessage, disconnect, connect, watchConnections } from '@wagmi/core';
+import { createConfig, getConnectors, signMessage, disconnect, getConnections, connect, watchConnections } from '@wagmi/core';
 import { http } from 'viem';
 import { mainnet } from 'viem/chains';
 import bs582 from 'bs58';
@@ -174,7 +174,7 @@ var EVM_WALLET_ID_MAP = {
   coinbaseWalletSDK: "coinbase",
   "io.rabby": "rabby",
   "me.rainbow": "rainbow",
-  "com.exodus.wallet": "exodus",
+  "com.exodus.web3-wallet": "exodus",
   walletConnect: "walletconnect"
 };
 var SOLANA_WALLET_ID_MAP = {
@@ -805,10 +805,12 @@ var createMetaMaskSolanaDappBrowserConnector = () => createDappBrowserSolanaConn
 // src/lib/connectors/solflare.ts
 var SOLFLARE_CONNECT_URL = "https://solflare.com/ul/v1/connect";
 var SOLFLARE_SIGN_MESSAGE_URL = "https://solflare.com/ul/v1/signMessage";
-var SOLFLARE_BROWSE_URL = "https://solflare.com/ul/v1/browse";
+var buildSolflareBrowseUrl = () => `https://solflare.com/ul/v1/browse/${encodeURIComponent(
+  window.location.href
+)}?ref=${encodeURIComponent(window.location.origin)}`;
 var createSolflareSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "solflare",
-  browseUrl: SOLFLARE_BROWSE_URL,
+  buildUrl: buildSolflareBrowseUrl,
   injectedKey: "isSolflare"
 });
 var SOLFLARE_CONFIG = {
@@ -880,12 +882,12 @@ var TRUST_CONFIG = {
   wcDeeplink: "https://link.trustwallet.com/wc",
   injectedKey: "isTrust"
 };
-var TRUST_BROWSE_URL = "https://link.trustwallet.com/open_url";
+var buildTrustBrowseUrl = () => `https://link.trustwallet.com/open_url?url=${encodeURIComponent(window.location.href)}`;
 var createTrustEvmMobileConnector = () => createWcEvmConnector(TRUST_CONFIG);
 var createTrustSolanaMobileConnector = () => createWcSolanaConnector(TRUST_CONFIG);
 var createTrustSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "trust",
-  browseUrl: TRUST_BROWSE_URL,
+  buildUrl: buildTrustBrowseUrl,
   injectedKey: "isTrust"
 });
 
@@ -903,14 +905,8 @@ var EXODUS_CONFIG = {
   wcDeeplink: "https://exodus.com/wc",
   injectedKey: "isExodus"
 };
-var EXODUS_BROWSE_URL = "https://exodus.com/m/browser";
 var createExodusEvmMobileConnector = () => createWcEvmConnector(EXODUS_CONFIG);
 var createExodusSolanaMobileConnector = () => createWcSolanaConnector(EXODUS_CONFIG);
-var createExodusSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
-  walletId: "exodus",
-  browseUrl: EXODUS_BROWSE_URL,
-  injectedKey: "isExodus"
-});
 
 // src/lib/connectors/binance.ts
 var BINANCE_CONFIG = {
@@ -948,12 +944,17 @@ var createCoinbaseSolanaDappBrowserConnector = () => createDappBrowserSolanaConn
 });
 
 // src/lib/connectors/bitget.ts
-var BITGET_BROWSE_URL = "https://bkcode.vip/dapp";
+var BITGET_CONFIG = {
+  walletId: "bitget",
+  wcDeeplink: "bitkeep://bkconnect",
+  injectedKey: "isBitKeep"
+};
+var buildBitgetBrowseUrl = () => `https://bkcode.vip?action=dapp&url=${encodeURIComponent(window.location.href)}`;
+var createBitgetSolanaConnector = () => createWcSolanaConnector(BITGET_CONFIG);
 var createBitgetSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "bitget",
-  browseUrl: BITGET_BROWSE_URL,
   injectedKey: "isBitKeep",
-  stripProtocol: true
+  buildUrl: buildBitgetBrowseUrl
 });
 var walletConfig = WALLETS.find((w) => w.id === "walletconnect");
 var disconnectWc2 = async () => {
@@ -1040,6 +1041,9 @@ var EVM_FALLBACK_CONNECTORS = [
   { id: "rainbow", create: createRainbowEvmMobileConnector },
   { id: "exodus", create: createExodusEvmMobileConnector }
 ];
+var cleanupWalletLocalStorage = () => {
+  Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
+};
 var getEvmConnectors = () => {
   const wagmiConnectors = getConnectors(getEvmConfig());
   const connectors = wagmiConnectors.map((c) => ({
@@ -1051,11 +1055,14 @@ var getEvmConnectors = () => {
     wallet: {
       _connector: c,
       connect: async () => {
+        const connections = getConnections(getEvmConfig());
+        if (connections.length > 0) await disconnect(getEvmConfig());
         const result = await connect(getEvmConfig(), { connector: c });
         if (!result.accounts[0]) throw new Error("No accounts returned");
         return connectedResult(result.accounts[0], { chainId: result.chainId });
       },
       disconnect: async () => {
+        cleanupWalletLocalStorage();
         await disconnect(getEvmConfig());
       },
       signMessage: async (message) => {
@@ -1185,11 +1192,10 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
   },
   {
     id: "exodus",
-    create: () => createSolanaMobileConnector(createExodusSolanaDappBrowserConnector())
+    create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector())
   }
 ] : [
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
-  // { id: 'metamask', create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector()) },
   {
     id: "solflare",
     create: () => createSolanaMobileConnector(createSolflareSolanaMobileConnector())
@@ -1199,6 +1205,7 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createTrustSolanaMobileConnector())
   },
   { id: "binance", create: () => createSolanaMobileConnector(createBinanceSolanaConnector()) },
+  { id: "bitget", create: createBitgetSolanaConnector },
   {
     id: "exodus",
     create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector())
@@ -1207,7 +1214,9 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
 var getSolanaWallets = () => {
   const { get } = getWallets();
   const wallets = get();
-  const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => w.constructor.name !== "SolflareMetaMaskWallet").map(createSolanaConnector);
+  const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
+    return w.constructor.name !== "SolflareMetaMaskWallet";
+  }).map(createSolanaConnector);
   addFallbackConnectors(connectors, SOLANA_FALLBACK_CONNECTORS);
   return connectors;
 };

package/dist/index.jsx

@@ -25,7 +25,13 @@ var getEvmConfig = () => {
 };
 
 // src/lib/evm/connectors.ts
-import { connect, disconnect, getConnectors, signMessage as wagmiSignMessage } from "@wagmi/core";
+import {
+  connect,
+  disconnect,
+  getConnections,
+  getConnectors,
+  signMessage as wagmiSignMessage
+} from "@wagmi/core";
 
 // src/lib/core/constants.ts
 var STORAGE_KEYS = {
@@ -169,7 +175,7 @@ var EVM_WALLET_ID_MAP = {
   coinbaseWalletSDK: "coinbase",
   "io.rabby": "rabby",
   "me.rainbow": "rainbow",
-  "com.exodus.wallet": "exodus",
+  "com.exodus.web3-wallet": "exodus",
   walletConnect: "walletconnect"
 };
 var SOLANA_WALLET_ID_MAP = {
@@ -813,10 +819,12 @@ var createMetaMaskSolanaDappBrowserConnector = () => createDappBrowserSolanaConn
 // src/lib/connectors/solflare.ts
 var SOLFLARE_CONNECT_URL = "https://solflare.com/ul/v1/connect";
 var SOLFLARE_SIGN_MESSAGE_URL = "https://solflare.com/ul/v1/signMessage";
-var SOLFLARE_BROWSE_URL = "https://solflare.com/ul/v1/browse";
+var buildSolflareBrowseUrl = () => `https://solflare.com/ul/v1/browse/${encodeURIComponent(
+  window.location.href
+)}?ref=${encodeURIComponent(window.location.origin)}`;
 var createSolflareSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "solflare",
-  browseUrl: SOLFLARE_BROWSE_URL,
+  buildUrl: buildSolflareBrowseUrl,
   injectedKey: "isSolflare"
 });
 var SOLFLARE_CONFIG = {
@@ -888,12 +896,12 @@ var TRUST_CONFIG = {
   wcDeeplink: "https://link.trustwallet.com/wc",
   injectedKey: "isTrust"
 };
-var TRUST_BROWSE_URL = "https://link.trustwallet.com/open_url";
+var buildTrustBrowseUrl = () => `https://link.trustwallet.com/open_url?url=${encodeURIComponent(window.location.href)}`;
 var createTrustEvmMobileConnector = () => createWcEvmConnector(TRUST_CONFIG);
 var createTrustSolanaMobileConnector = () => createWcSolanaConnector(TRUST_CONFIG);
 var createTrustSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "trust",
-  browseUrl: TRUST_BROWSE_URL,
+  buildUrl: buildTrustBrowseUrl,
   injectedKey: "isTrust"
 });
 
@@ -911,14 +919,8 @@ var EXODUS_CONFIG = {
   wcDeeplink: "https://exodus.com/wc",
   injectedKey: "isExodus"
 };
-var EXODUS_BROWSE_URL = "https://exodus.com/m/browser";
 var createExodusEvmMobileConnector = () => createWcEvmConnector(EXODUS_CONFIG);
 var createExodusSolanaMobileConnector = () => createWcSolanaConnector(EXODUS_CONFIG);
-var createExodusSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
-  walletId: "exodus",
-  browseUrl: EXODUS_BROWSE_URL,
-  injectedKey: "isExodus"
-});
 
 // src/lib/connectors/binance.ts
 var BINANCE_CONFIG = {
@@ -956,12 +958,17 @@ var createCoinbaseSolanaDappBrowserConnector = () => createDappBrowserSolanaConn
 });
 
 // src/lib/connectors/bitget.ts
-var BITGET_BROWSE_URL = "https://bkcode.vip/dapp";
+var BITGET_CONFIG = {
+  walletId: "bitget",
+  wcDeeplink: "bitkeep://bkconnect",
+  injectedKey: "isBitKeep"
+};
+var buildBitgetBrowseUrl = () => `https://bkcode.vip?action=dapp&url=${encodeURIComponent(window.location.href)}`;
+var createBitgetSolanaConnector = () => createWcSolanaConnector(BITGET_CONFIG);
 var createBitgetSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "bitget",
-  browseUrl: BITGET_BROWSE_URL,
   injectedKey: "isBitKeep",
-  stripProtocol: true
+  buildUrl: buildBitgetBrowseUrl
 });
 
 // src/lib/connectors/walletconnect.ts
@@ -1051,6 +1058,9 @@ var EVM_FALLBACK_CONNECTORS = [
   { id: "rainbow", create: createRainbowEvmMobileConnector },
   { id: "exodus", create: createExodusEvmMobileConnector }
 ];
+var cleanupWalletLocalStorage = () => {
+  Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
+};
 var getEvmConnectors = () => {
   const wagmiConnectors = getConnectors(getEvmConfig());
   const connectors = wagmiConnectors.map((c) => ({
@@ -1062,11 +1072,14 @@ var getEvmConnectors = () => {
     wallet: {
       _connector: c,
       connect: async () => {
+        const connections = getConnections(getEvmConfig());
+        if (connections.length > 0) await disconnect(getEvmConfig());
         const result = await connect(getEvmConfig(), { connector: c });
         if (!result.accounts[0]) throw new Error("No accounts returned");
         return connectedResult(result.accounts[0], { chainId: result.chainId });
       },
       disconnect: async () => {
+        cleanupWalletLocalStorage();
         await disconnect(getEvmConfig());
       },
       signMessage: async (message) => {
@@ -1206,11 +1219,10 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
   },
   {
     id: "exodus",
-    create: () => createSolanaMobileConnector(createExodusSolanaDappBrowserConnector())
+    create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector())
   }
 ] : [
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
-  // { id: 'metamask', create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector()) },
   {
     id: "solflare",
     create: () => createSolanaMobileConnector(createSolflareSolanaMobileConnector())
@@ -1220,6 +1232,7 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createTrustSolanaMobileConnector())
   },
   { id: "binance", create: () => createSolanaMobileConnector(createBinanceSolanaConnector()) },
+  { id: "bitget", create: createBitgetSolanaConnector },
   {
     id: "exodus",
     create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector())
@@ -1228,7 +1241,9 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
 var getSolanaWallets = () => {
   const { get } = getWallets();
   const wallets = get();
-  const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => w.constructor.name !== "SolflareMetaMaskWallet").map(createSolanaConnector);
+  const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
+    return w.constructor.name !== "SolflareMetaMaskWallet";
+  }).map(createSolanaConnector);
   addFallbackConnectors(connectors, SOLANA_FALLBACK_CONNECTORS);
   return connectors;
 };

package/dist/lib/connectors/bitget.d.ts

@@ -1,2 +1,3 @@
 import type { SolanaWalletConnector } from '../solana';
+export declare const createBitgetSolanaConnector: () => SolanaWalletConnector;
 export declare const createBitgetSolanaDappBrowserConnector: () => SolanaWalletConnector;

package/dist/lib/connectors/index.d.ts

@@ -7,5 +7,5 @@ export { createExodusEvmMobileConnector, createExodusSolanaMobileConnector, crea
 export { createBinanceEvmConnector, createBinanceSolanaConnector, createBinanceSolanaDappBrowserConnector, } from './binance';
 export { createOkxSolanaDappBrowserConnector } from './okx';
 export { createCoinbaseSolanaDappBrowserConnector } from './coinbase';
-export { createBitgetSolanaDappBrowserConnector } from './bitget';
+export { createBitgetSolanaDappBrowserConnector, createBitgetSolanaConnector } from './bitget';
 export { createWalletConnectEvmConnector, createWalletConnectSolanaConnector, } from './walletconnect';

package/dist/lib/evm/connectors.d.ts

@@ -1,2 +1,3 @@
 import type { EvmWalletConnector } from './types';
+export declare const cleanupWalletLocalStorage: () => void;
 export declare const getEvmConnectors: () => EvmWalletConnector[];

package/package.json

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