@bit-buccaneers/wallet-abstraction 0.0.12 → 0.0.14

package/dist/dev.js

@@ -50,6 +50,7 @@ var qrcodeResult = (uri, wait) => ({
   wait
 });
 var pendingResult = () => ({ status: "pending" });
+var downloadOnlyResult = () => ({ status: "downloadOnly" });
 
 // src/lib/core/storage.ts
 var storage = {
@@ -307,20 +308,6 @@ var getDappKeyPair = (storageKey) => {
   });
   return keyPair;
 };
-var buildConnectUrl = (config2, params) => {
-  const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
-  const url = new URL(config2.connectUrl);
-  url.searchParams.set("app_url", params.appUrl);
-  url.searchParams.set("dapp_encryption_public_key", bs582.encode(keyPair.publicKey));
-  url.searchParams.set("redirect_link", params.redirectUrl);
-  if (params.cluster) {
-    url.searchParams.set("cluster", params.cluster);
-  }
-  if (params.chain) {
-    url.searchParams.set("chain", params.chain);
-  }
-  return url.toString();
-};
 var parseConnectResponse = (urlParams, config2) => {
   const walletPublicKey = urlParams.get(config2.encryptionKeyParam);
   const nonce = urlParams.get("nonce");
@@ -375,29 +362,6 @@ var restoreMobileSession = (sessionKey) => {
 var getStoredSession = (sessionKey) => {
   return storage.get(sessionKey);
 };
-var buildSignMessageUrl = (signUrl, config2, sessionKey, message, redirectUrl) => {
-  const session = getStoredSession(sessionKey);
-  if (!session) return null;
-  const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
-  const sharedSecret = new Uint8Array(session.sharedSecret);
-  const payload = {
-    message: bs582.encode(new TextEncoder().encode(message)),
-    session: session.session,
-    display: "utf8"
-  };
-  const nonce = nacl.randomBytes(24);
-  const encrypted = nacl.box.after(
-    new TextEncoder().encode(JSON.stringify(payload)),
-    nonce,
-    sharedSecret
-  );
-  const url = new URL(signUrl);
-  url.searchParams.set("dapp_encryption_public_key", bs582.encode(keyPair.publicKey));
-  url.searchParams.set("nonce", bs582.encode(nonce));
-  url.searchParams.set("redirect_link", redirectUrl);
-  url.searchParams.set("payload", bs582.encode(encrypted));
-  return url.toString();
-};
 var parseSignMessageResponse = (config2, sessionKey) => {
   const params = new URLSearchParams(window.location.search);
   const nonce = params.get("nonce");
@@ -740,9 +704,48 @@ var createWcSolanaConnector = (config2) => {
   };
 };
 
+// src/lib/connectors/shared/download-only-connector.ts
+var createDownloadOnlySolanaConnector = (config2) => {
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
+  return {
+    ...walletConfig2,
+    type: "solana",
+    installed: false,
+    wallet: {
+      _provider: null,
+      connect: async () => {
+        return downloadOnlyResult();
+      },
+      disconnect: async () => {
+      },
+      signMessage: async () => {
+        throw new Error("Wallet is not installed");
+      }
+    }
+  };
+};
+var createDownloadOnlyEvmConnector = (config2) => {
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
+  return {
+    ...walletConfig2,
+    type: "evm",
+    installed: false,
+    wallet: {
+      _connector: null,
+      connect: async () => {
+        return downloadOnlyResult();
+      },
+      disconnect: async () => {
+      },
+      signMessage: async () => {
+        throw new Error("Wallet is not installed");
+      }
+    }
+  };
+};
+
 // src/lib/connectors/phantom.ts
 var PHANTOM_CONNECT_URL = "https://phantom.app/ul/v1/connect";
-var PHANTOM_SIGN_MESSAGE_URL = "https://phantom.app/ul/v1/signMessage";
 var PHANTOM_BROWSE_URL = "https://phantom.app/ul/browse";
 var createPhantomSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "phantom",
@@ -760,9 +763,9 @@ var STORAGE_KEYS2 = {
   SESSION: "phantom_mobile_session",
   SIGN_PENDING: "phantom_mobile_sign_pending"
 };
-var isInPhantom = () => isInWalletBrowser("isPhantom");
 var phantomWalletConfig = WALLETS.find((i) => i.id === "phantom");
-var createPhantomEvmConnector = () => ({
+var createPhantomEvmConnector = () => createDownloadOnlyEvmConnector({ walletId: "phantom" });
+var createPhantomEvmConnectorDeeplink = () => ({
   ...phantomWalletConfig,
   type: "evm",
   wallet: {
@@ -781,50 +784,7 @@ var createPhantomEvmConnector = () => ({
     }
   }
 });
-var createPhantomSolanaConnector = () => ({
-  ...phantomWalletConfig,
-  type: "solana",
-  wallet: {
-    _provider: null,
-    connect: async () => {
-      if (isInPhantom() && window.solana) {
-        return connectSolanaInjected();
-      }
-      storage.setString(STORAGE_KEYS2.PENDING, "1");
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?${PHANTOM_CONFIG.callbackParam}=1`;
-      window.location.href = buildConnectUrl(PHANTOM_CONFIG, {
-        appUrl: window.location.origin,
-        redirectUrl,
-        cluster: "mainnet-beta",
-        chain: "solana"
-      });
-      return pendingResult();
-    },
-    disconnect: async () => {
-      storage.remove(STORAGE_KEYS2.SESSION);
-    },
-    signMessage: async (message) => {
-      if (isInPhantom()) {
-        return signSolanaInjected(message);
-      }
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?phantom_sign_callback=1`;
-      const signUrl = buildSignMessageUrl(
-        PHANTOM_SIGN_MESSAGE_URL,
-        PHANTOM_CONFIG,
-        STORAGE_KEYS2.SESSION,
-        message,
-        redirectUrl
-      );
-      if (!signUrl) {
-        throw new Error("No Phantom session for signing");
-      }
-      storage.setString(STORAGE_KEYS2.SIGN_PENDING, "1");
-      window.location.href = signUrl;
-      return new Promise(() => {
-      });
-    }
-  }
-});
+var createPhantomSolanaConnector = () => createDownloadOnlySolanaConnector({ walletId: "phantom" });
 var isPhantomMobilePending = () => storage.getString(STORAGE_KEYS2.PENDING) === "1";
 var handlePhantomMobileCallback = () => handleMobileCallback(PHANTOM_CONFIG, STORAGE_KEYS2.PENDING, STORAGE_KEYS2.SESSION);
 var restorePhantomMobileSession = () => restoreMobileSession(STORAGE_KEYS2.SESSION);
@@ -856,7 +816,6 @@ 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 buildSolflareBrowseUrl = () => `https://solflare.com/ul/v1/browse/${encodeURIComponent(
   window.location.href
 )}?ref=${encodeURIComponent(window.location.origin)}`;
@@ -876,44 +835,8 @@ var STORAGE_KEYS3 = {
   SESSION: "solflare_mobile_session",
   SIGN_PENDING: "solflare_mobile_sign_pending"
 };
-var solflareWalletConfig = WALLETS.find((i) => i.id === "solflare");
-var createSolflareSolanaMobileConnector = () => ({
-  ...solflareWalletConfig,
-  type: "solana",
-  wallet: {
-    _provider: null,
-    connect: async () => {
-      storage.setString(STORAGE_KEYS3.PENDING, "1");
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?${SOLFLARE_CONFIG.callbackParam}=1`;
-      window.location.href = buildConnectUrl(SOLFLARE_CONFIG, {
-        appUrl: window.location.origin,
-        redirectUrl,
-        cluster: "mainnet-beta"
-      });
-      return pendingResult();
-    },
-    disconnect: async () => {
-      storage.remove(STORAGE_KEYS3.SESSION);
-    },
-    signMessage: async (message) => {
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?solflare_sign_callback=1`;
-      const signUrl = buildSignMessageUrl(
-        SOLFLARE_SIGN_MESSAGE_URL,
-        SOLFLARE_CONFIG,
-        STORAGE_KEYS3.SESSION,
-        message,
-        redirectUrl
-      );
-      if (!signUrl) {
-        throw new Error("No Solflare session for signing");
-      }
-      storage.setString(STORAGE_KEYS3.SIGN_PENDING, "1");
-      window.location.href = signUrl;
-      return new Promise(() => {
-      });
-    }
-  }
-});
+WALLETS.find((i) => i.id === "solflare");
+var createSolflareSolanaMobileConnector = () => createDownloadOnlySolanaConnector({ walletId: "solflare" });
 var isSolflareMobilePending = () => storage.getString(STORAGE_KEYS3.PENDING) === "1";
 var handleSolflareMobileCallback = () => handleMobileCallback(SOLFLARE_CONFIG, STORAGE_KEYS3.PENDING, STORAGE_KEYS3.SESSION);
 var restoreSolflareMobileSession = () => restoreMobileSession(STORAGE_KEYS3.SESSION);
@@ -1082,7 +1005,10 @@ var createWalletConnectSolanaConnector = () => {
 
 // src/lib/evm/connectors.ts
 var EVM_FALLBACK_CONNECTORS = [
-  { id: "phantom", create: createPhantomEvmConnector },
+  {
+    id: "phantom",
+    create: isMobile() ? createPhantomEvmConnectorDeeplink : createPhantomEvmConnector
+  },
   { id: "metamask", create: createMetaMaskEvmConnector },
   { id: "trust", create: createTrustEvmMobileConnector },
   { id: "binance", create: createBinanceEvmConnector },
@@ -1327,8 +1253,13 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
 var getSolanaWallets = () => {
   const { get } = getWallets();
   const wallets = get();
+  const seenNames = /* @__PURE__ */ new Set();
   const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
-    return w.constructor.name !== "SolflareMetaMaskWallet";
+    if (w.constructor.name === "SolflareMetaMaskWallet") return false;
+    if (w.name === "MetaMask" && w.icon?.includes("9945ff")) return false;
+    if (seenNames.has(w.name)) return false;
+    seenNames.add(w.name);
+    return true;
   }).map(createSolanaConnector);
   console.log("wallets", { wallets });
   console.log("connectors", { connectors });

package/dist/dev.jsx

@@ -25,12 +25,7 @@ var getEvmConfig = () => {
 };
 
 // src/lib/evm/connectors.ts
-import {
-  connect,
-  disconnect,
-  getConnectors,
-  signMessage as wagmiSignMessage
-} from "@wagmi/core";
+import { connect, disconnect, getConnectors, signMessage as wagmiSignMessage } from "@wagmi/core";
 
 // src/lib/core/constants.ts
 var STORAGE_KEYS = {
@@ -50,6 +45,7 @@ var qrcodeResult = (uri, wait) => ({
   wait
 });
 var pendingResult = () => ({ status: "pending" });
+var downloadOnlyResult = () => ({ status: "downloadOnly" });
 
 // src/lib/core/storage.ts
 var storage = {
@@ -314,20 +310,6 @@ var getDappKeyPair = (storageKey) => {
   });
   return keyPair;
 };
-var buildConnectUrl = (config2, params) => {
-  const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
-  const url = new URL(config2.connectUrl);
-  url.searchParams.set("app_url", params.appUrl);
-  url.searchParams.set("dapp_encryption_public_key", bs582.encode(keyPair.publicKey));
-  url.searchParams.set("redirect_link", params.redirectUrl);
-  if (params.cluster) {
-    url.searchParams.set("cluster", params.cluster);
-  }
-  if (params.chain) {
-    url.searchParams.set("chain", params.chain);
-  }
-  return url.toString();
-};
 var parseConnectResponse = (urlParams, config2) => {
   const walletPublicKey = urlParams.get(config2.encryptionKeyParam);
   const nonce = urlParams.get("nonce");
@@ -382,29 +364,6 @@ var restoreMobileSession = (sessionKey) => {
 var getStoredSession = (sessionKey) => {
   return storage.get(sessionKey);
 };
-var buildSignMessageUrl = (signUrl, config2, sessionKey, message, redirectUrl) => {
-  const session = getStoredSession(sessionKey);
-  if (!session) return null;
-  const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
-  const sharedSecret = new Uint8Array(session.sharedSecret);
-  const payload = {
-    message: bs582.encode(new TextEncoder().encode(message)),
-    session: session.session,
-    display: "utf8"
-  };
-  const nonce = nacl.randomBytes(24);
-  const encrypted = nacl.box.after(
-    new TextEncoder().encode(JSON.stringify(payload)),
-    nonce,
-    sharedSecret
-  );
-  const url = new URL(signUrl);
-  url.searchParams.set("dapp_encryption_public_key", bs582.encode(keyPair.publicKey));
-  url.searchParams.set("nonce", bs582.encode(nonce));
-  url.searchParams.set("redirect_link", redirectUrl);
-  url.searchParams.set("payload", bs582.encode(encrypted));
-  return url.toString();
-};
 var parseSignMessageResponse = (config2, sessionKey) => {
   const params = new URLSearchParams(window.location.search);
   const nonce = params.get("nonce");
@@ -753,9 +712,48 @@ var createWcSolanaConnector = (config2) => {
   };
 };
 
+// src/lib/connectors/shared/download-only-connector.ts
+var createDownloadOnlySolanaConnector = (config2) => {
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
+  return {
+    ...walletConfig2,
+    type: "solana",
+    installed: false,
+    wallet: {
+      _provider: null,
+      connect: async () => {
+        return downloadOnlyResult();
+      },
+      disconnect: async () => {
+      },
+      signMessage: async () => {
+        throw new Error("Wallet is not installed");
+      }
+    }
+  };
+};
+var createDownloadOnlyEvmConnector = (config2) => {
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
+  return {
+    ...walletConfig2,
+    type: "evm",
+    installed: false,
+    wallet: {
+      _connector: null,
+      connect: async () => {
+        return downloadOnlyResult();
+      },
+      disconnect: async () => {
+      },
+      signMessage: async () => {
+        throw new Error("Wallet is not installed");
+      }
+    }
+  };
+};
+
 // src/lib/connectors/phantom.ts
 var PHANTOM_CONNECT_URL = "https://phantom.app/ul/v1/connect";
-var PHANTOM_SIGN_MESSAGE_URL = "https://phantom.app/ul/v1/signMessage";
 var PHANTOM_BROWSE_URL = "https://phantom.app/ul/browse";
 var createPhantomSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "phantom",
@@ -773,9 +771,9 @@ var STORAGE_KEYS2 = {
   SESSION: "phantom_mobile_session",
   SIGN_PENDING: "phantom_mobile_sign_pending"
 };
-var isInPhantom = () => isInWalletBrowser("isPhantom");
 var phantomWalletConfig = WALLETS.find((i) => i.id === "phantom");
-var createPhantomEvmConnector = () => ({
+var createPhantomEvmConnector = () => createDownloadOnlyEvmConnector({ walletId: "phantom" });
+var createPhantomEvmConnectorDeeplink = () => ({
   ...phantomWalletConfig,
   type: "evm",
   wallet: {
@@ -794,50 +792,7 @@ var createPhantomEvmConnector = () => ({
     }
   }
 });
-var createPhantomSolanaConnector = () => ({
-  ...phantomWalletConfig,
-  type: "solana",
-  wallet: {
-    _provider: null,
-    connect: async () => {
-      if (isInPhantom() && window.solana) {
-        return connectSolanaInjected();
-      }
-      storage.setString(STORAGE_KEYS2.PENDING, "1");
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?${PHANTOM_CONFIG.callbackParam}=1`;
-      window.location.href = buildConnectUrl(PHANTOM_CONFIG, {
-        appUrl: window.location.origin,
-        redirectUrl,
-        cluster: "mainnet-beta",
-        chain: "solana"
-      });
-      return pendingResult();
-    },
-    disconnect: async () => {
-      storage.remove(STORAGE_KEYS2.SESSION);
-    },
-    signMessage: async (message) => {
-      if (isInPhantom()) {
-        return signSolanaInjected(message);
-      }
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?phantom_sign_callback=1`;
-      const signUrl = buildSignMessageUrl(
-        PHANTOM_SIGN_MESSAGE_URL,
-        PHANTOM_CONFIG,
-        STORAGE_KEYS2.SESSION,
-        message,
-        redirectUrl
-      );
-      if (!signUrl) {
-        throw new Error("No Phantom session for signing");
-      }
-      storage.setString(STORAGE_KEYS2.SIGN_PENDING, "1");
-      window.location.href = signUrl;
-      return new Promise(() => {
-      });
-    }
-  }
-});
+var createPhantomSolanaConnector = () => createDownloadOnlySolanaConnector({ walletId: "phantom" });
 var isPhantomMobilePending = () => storage.getString(STORAGE_KEYS2.PENDING) === "1";
 var handlePhantomMobileCallback = () => handleMobileCallback(PHANTOM_CONFIG, STORAGE_KEYS2.PENDING, STORAGE_KEYS2.SESSION);
 var restorePhantomMobileSession = () => restoreMobileSession(STORAGE_KEYS2.SESSION);
@@ -869,7 +824,6 @@ 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 buildSolflareBrowseUrl = () => `https://solflare.com/ul/v1/browse/${encodeURIComponent(
   window.location.href
 )}?ref=${encodeURIComponent(window.location.origin)}`;
@@ -890,43 +844,7 @@ var STORAGE_KEYS3 = {
   SIGN_PENDING: "solflare_mobile_sign_pending"
 };
 var solflareWalletConfig = WALLETS.find((i) => i.id === "solflare");
-var createSolflareSolanaMobileConnector = () => ({
-  ...solflareWalletConfig,
-  type: "solana",
-  wallet: {
-    _provider: null,
-    connect: async () => {
-      storage.setString(STORAGE_KEYS3.PENDING, "1");
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?${SOLFLARE_CONFIG.callbackParam}=1`;
-      window.location.href = buildConnectUrl(SOLFLARE_CONFIG, {
-        appUrl: window.location.origin,
-        redirectUrl,
-        cluster: "mainnet-beta"
-      });
-      return pendingResult();
-    },
-    disconnect: async () => {
-      storage.remove(STORAGE_KEYS3.SESSION);
-    },
-    signMessage: async (message) => {
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?solflare_sign_callback=1`;
-      const signUrl = buildSignMessageUrl(
-        SOLFLARE_SIGN_MESSAGE_URL,
-        SOLFLARE_CONFIG,
-        STORAGE_KEYS3.SESSION,
-        message,
-        redirectUrl
-      );
-      if (!signUrl) {
-        throw new Error("No Solflare session for signing");
-      }
-      storage.setString(STORAGE_KEYS3.SIGN_PENDING, "1");
-      window.location.href = signUrl;
-      return new Promise(() => {
-      });
-    }
-  }
-});
+var createSolflareSolanaMobileConnector = () => createDownloadOnlySolanaConnector({ walletId: "solflare" });
 var isSolflareMobilePending = () => storage.getString(STORAGE_KEYS3.PENDING) === "1";
 var handleSolflareMobileCallback = () => handleMobileCallback(SOLFLARE_CONFIG, STORAGE_KEYS3.PENDING, STORAGE_KEYS3.SESSION);
 var restoreSolflareMobileSession = () => restoreMobileSession(STORAGE_KEYS3.SESSION);
@@ -1098,7 +1016,10 @@ var createWalletConnectSolanaConnector = () => {
 
 // src/lib/evm/connectors.ts
 var EVM_FALLBACK_CONNECTORS = [
-  { id: "phantom", create: createPhantomEvmConnector },
+  {
+    id: "phantom",
+    create: isMobile() ? createPhantomEvmConnectorDeeplink : createPhantomEvmConnector
+  },
   { id: "metamask", create: createMetaMaskEvmConnector },
   { id: "trust", create: createTrustEvmMobileConnector },
   { id: "binance", create: createBinanceEvmConnector },
@@ -1364,8 +1285,13 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
 var getSolanaWallets = () => {
   const { get } = getWallets();
   const wallets = get();
+  const seenNames = /* @__PURE__ */ new Set();
   const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
-    return w.constructor.name !== "SolflareMetaMaskWallet";
+    if (w.constructor.name === "SolflareMetaMaskWallet") return false;
+    if (w.name === "MetaMask" && w.icon?.includes("9945ff")) return false;
+    if (seenNames.has(w.name)) return false;
+    seenNames.add(w.name);
+    return true;
   }).map(createSolanaConnector);
   console.log("wallets", { wallets });
   console.log("connectors", { connectors });

package/dist/index.js

@@ -50,6 +50,7 @@ var qrcodeResult = (uri, wait) => ({
   wait
 });
 var pendingResult = () => ({ status: "pending" });
+var downloadOnlyResult = () => ({ status: "downloadOnly" });
 
 // src/lib/core/storage.ts
 var storage = {
@@ -307,20 +308,6 @@ var getDappKeyPair = (storageKey) => {
   });
   return keyPair;
 };
-var buildConnectUrl = (config2, params) => {
-  const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
-  const url = new URL(config2.connectUrl);
-  url.searchParams.set("app_url", params.appUrl);
-  url.searchParams.set("dapp_encryption_public_key", bs582.encode(keyPair.publicKey));
-  url.searchParams.set("redirect_link", params.redirectUrl);
-  if (params.cluster) {
-    url.searchParams.set("cluster", params.cluster);
-  }
-  if (params.chain) {
-    url.searchParams.set("chain", params.chain);
-  }
-  return url.toString();
-};
 var parseConnectResponse = (urlParams, config2) => {
   const walletPublicKey = urlParams.get(config2.encryptionKeyParam);
   const nonce = urlParams.get("nonce");
@@ -375,29 +362,6 @@ var restoreMobileSession = (sessionKey) => {
 var getStoredSession = (sessionKey) => {
   return storage.get(sessionKey);
 };
-var buildSignMessageUrl = (signUrl, config2, sessionKey, message, redirectUrl) => {
-  const session = getStoredSession(sessionKey);
-  if (!session) return null;
-  const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
-  const sharedSecret = new Uint8Array(session.sharedSecret);
-  const payload = {
-    message: bs582.encode(new TextEncoder().encode(message)),
-    session: session.session,
-    display: "utf8"
-  };
-  const nonce = nacl.randomBytes(24);
-  const encrypted = nacl.box.after(
-    new TextEncoder().encode(JSON.stringify(payload)),
-    nonce,
-    sharedSecret
-  );
-  const url = new URL(signUrl);
-  url.searchParams.set("dapp_encryption_public_key", bs582.encode(keyPair.publicKey));
-  url.searchParams.set("nonce", bs582.encode(nonce));
-  url.searchParams.set("redirect_link", redirectUrl);
-  url.searchParams.set("payload", bs582.encode(encrypted));
-  return url.toString();
-};
 var parseSignMessageResponse = (config2, sessionKey) => {
   const params = new URLSearchParams(window.location.search);
   const nonce = params.get("nonce");
@@ -740,9 +704,48 @@ var createWcSolanaConnector = (config2) => {
   };
 };
 
+// src/lib/connectors/shared/download-only-connector.ts
+var createDownloadOnlySolanaConnector = (config2) => {
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
+  return {
+    ...walletConfig2,
+    type: "solana",
+    installed: false,
+    wallet: {
+      _provider: null,
+      connect: async () => {
+        return downloadOnlyResult();
+      },
+      disconnect: async () => {
+      },
+      signMessage: async () => {
+        throw new Error("Wallet is not installed");
+      }
+    }
+  };
+};
+var createDownloadOnlyEvmConnector = (config2) => {
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
+  return {
+    ...walletConfig2,
+    type: "evm",
+    installed: false,
+    wallet: {
+      _connector: null,
+      connect: async () => {
+        return downloadOnlyResult();
+      },
+      disconnect: async () => {
+      },
+      signMessage: async () => {
+        throw new Error("Wallet is not installed");
+      }
+    }
+  };
+};
+
 // src/lib/connectors/phantom.ts
 var PHANTOM_CONNECT_URL = "https://phantom.app/ul/v1/connect";
-var PHANTOM_SIGN_MESSAGE_URL = "https://phantom.app/ul/v1/signMessage";
 var PHANTOM_BROWSE_URL = "https://phantom.app/ul/browse";
 var createPhantomSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "phantom",
@@ -760,9 +763,9 @@ var STORAGE_KEYS2 = {
   SESSION: "phantom_mobile_session",
   SIGN_PENDING: "phantom_mobile_sign_pending"
 };
-var isInPhantom = () => isInWalletBrowser("isPhantom");
 var phantomWalletConfig = WALLETS.find((i) => i.id === "phantom");
-var createPhantomEvmConnector = () => ({
+var createPhantomEvmConnector = () => createDownloadOnlyEvmConnector({ walletId: "phantom" });
+var createPhantomEvmConnectorDeeplink = () => ({
   ...phantomWalletConfig,
   type: "evm",
   wallet: {
@@ -781,50 +784,7 @@ var createPhantomEvmConnector = () => ({
     }
   }
 });
-var createPhantomSolanaConnector = () => ({
-  ...phantomWalletConfig,
-  type: "solana",
-  wallet: {
-    _provider: null,
-    connect: async () => {
-      if (isInPhantom() && window.solana) {
-        return connectSolanaInjected();
-      }
-      storage.setString(STORAGE_KEYS2.PENDING, "1");
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?${PHANTOM_CONFIG.callbackParam}=1`;
-      window.location.href = buildConnectUrl(PHANTOM_CONFIG, {
-        appUrl: window.location.origin,
-        redirectUrl,
-        cluster: "mainnet-beta",
-        chain: "solana"
-      });
-      return pendingResult();
-    },
-    disconnect: async () => {
-      storage.remove(STORAGE_KEYS2.SESSION);
-    },
-    signMessage: async (message) => {
-      if (isInPhantom()) {
-        return signSolanaInjected(message);
-      }
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?phantom_sign_callback=1`;
-      const signUrl = buildSignMessageUrl(
-        PHANTOM_SIGN_MESSAGE_URL,
-        PHANTOM_CONFIG,
-        STORAGE_KEYS2.SESSION,
-        message,
-        redirectUrl
-      );
-      if (!signUrl) {
-        throw new Error("No Phantom session for signing");
-      }
-      storage.setString(STORAGE_KEYS2.SIGN_PENDING, "1");
-      window.location.href = signUrl;
-      return new Promise(() => {
-      });
-    }
-  }
-});
+var createPhantomSolanaConnector = () => createDownloadOnlySolanaConnector({ walletId: "phantom" });
 var isPhantomMobilePending = () => storage.getString(STORAGE_KEYS2.PENDING) === "1";
 var handlePhantomMobileCallback = () => handleMobileCallback(PHANTOM_CONFIG, STORAGE_KEYS2.PENDING, STORAGE_KEYS2.SESSION);
 var restorePhantomMobileSession = () => restoreMobileSession(STORAGE_KEYS2.SESSION);
@@ -856,7 +816,6 @@ 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 buildSolflareBrowseUrl = () => `https://solflare.com/ul/v1/browse/${encodeURIComponent(
   window.location.href
 )}?ref=${encodeURIComponent(window.location.origin)}`;
@@ -876,44 +835,8 @@ var STORAGE_KEYS3 = {
   SESSION: "solflare_mobile_session",
   SIGN_PENDING: "solflare_mobile_sign_pending"
 };
-var solflareWalletConfig = WALLETS.find((i) => i.id === "solflare");
-var createSolflareSolanaMobileConnector = () => ({
-  ...solflareWalletConfig,
-  type: "solana",
-  wallet: {
-    _provider: null,
-    connect: async () => {
-      storage.setString(STORAGE_KEYS3.PENDING, "1");
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?${SOLFLARE_CONFIG.callbackParam}=1`;
-      window.location.href = buildConnectUrl(SOLFLARE_CONFIG, {
-        appUrl: window.location.origin,
-        redirectUrl,
-        cluster: "mainnet-beta"
-      });
-      return pendingResult();
-    },
-    disconnect: async () => {
-      storage.remove(STORAGE_KEYS3.SESSION);
-    },
-    signMessage: async (message) => {
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?solflare_sign_callback=1`;
-      const signUrl = buildSignMessageUrl(
-        SOLFLARE_SIGN_MESSAGE_URL,
-        SOLFLARE_CONFIG,
-        STORAGE_KEYS3.SESSION,
-        message,
-        redirectUrl
-      );
-      if (!signUrl) {
-        throw new Error("No Solflare session for signing");
-      }
-      storage.setString(STORAGE_KEYS3.SIGN_PENDING, "1");
-      window.location.href = signUrl;
-      return new Promise(() => {
-      });
-    }
-  }
-});
+WALLETS.find((i) => i.id === "solflare");
+var createSolflareSolanaMobileConnector = () => createDownloadOnlySolanaConnector({ walletId: "solflare" });
 var isSolflareMobilePending = () => storage.getString(STORAGE_KEYS3.PENDING) === "1";
 var handleSolflareMobileCallback = () => handleMobileCallback(SOLFLARE_CONFIG, STORAGE_KEYS3.PENDING, STORAGE_KEYS3.SESSION);
 var restoreSolflareMobileSession = () => restoreMobileSession(STORAGE_KEYS3.SESSION);
@@ -1082,7 +1005,10 @@ var createWalletConnectSolanaConnector = () => {
 
 // src/lib/evm/connectors.ts
 var EVM_FALLBACK_CONNECTORS = [
-  { id: "phantom", create: createPhantomEvmConnector },
+  {
+    id: "phantom",
+    create: isMobile() ? createPhantomEvmConnectorDeeplink : createPhantomEvmConnector
+  },
   { id: "metamask", create: createMetaMaskEvmConnector },
   { id: "trust", create: createTrustEvmMobileConnector },
   { id: "binance", create: createBinanceEvmConnector },
@@ -1327,8 +1253,13 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
 var getSolanaWallets = () => {
   const { get } = getWallets();
   const wallets = get();
+  const seenNames = /* @__PURE__ */ new Set();
   const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
-    return w.constructor.name !== "SolflareMetaMaskWallet";
+    if (w.constructor.name === "SolflareMetaMaskWallet") return false;
+    if (w.name === "MetaMask" && w.icon?.includes("9945ff")) return false;
+    if (seenNames.has(w.name)) return false;
+    seenNames.add(w.name);
+    return true;
   }).map(createSolanaConnector);
   console.log("wallets", { wallets });
   console.log("connectors", { connectors });

package/dist/index.jsx

@@ -25,12 +25,7 @@ var getEvmConfig = () => {
 };
 
 // src/lib/evm/connectors.ts
-import {
-  connect,
-  disconnect,
-  getConnectors,
-  signMessage as wagmiSignMessage
-} from "@wagmi/core";
+import { connect, disconnect, getConnectors, signMessage as wagmiSignMessage } from "@wagmi/core";
 
 // src/lib/core/constants.ts
 var STORAGE_KEYS = {
@@ -50,6 +45,7 @@ var qrcodeResult = (uri, wait) => ({
   wait
 });
 var pendingResult = () => ({ status: "pending" });
+var downloadOnlyResult = () => ({ status: "downloadOnly" });
 
 // src/lib/core/storage.ts
 var storage = {
@@ -314,20 +310,6 @@ var getDappKeyPair = (storageKey) => {
   });
   return keyPair;
 };
-var buildConnectUrl = (config2, params) => {
-  const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
-  const url = new URL(config2.connectUrl);
-  url.searchParams.set("app_url", params.appUrl);
-  url.searchParams.set("dapp_encryption_public_key", bs582.encode(keyPair.publicKey));
-  url.searchParams.set("redirect_link", params.redirectUrl);
-  if (params.cluster) {
-    url.searchParams.set("cluster", params.cluster);
-  }
-  if (params.chain) {
-    url.searchParams.set("chain", params.chain);
-  }
-  return url.toString();
-};
 var parseConnectResponse = (urlParams, config2) => {
   const walletPublicKey = urlParams.get(config2.encryptionKeyParam);
   const nonce = urlParams.get("nonce");
@@ -382,29 +364,6 @@ var restoreMobileSession = (sessionKey) => {
 var getStoredSession = (sessionKey) => {
   return storage.get(sessionKey);
 };
-var buildSignMessageUrl = (signUrl, config2, sessionKey, message, redirectUrl) => {
-  const session = getStoredSession(sessionKey);
-  if (!session) return null;
-  const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
-  const sharedSecret = new Uint8Array(session.sharedSecret);
-  const payload = {
-    message: bs582.encode(new TextEncoder().encode(message)),
-    session: session.session,
-    display: "utf8"
-  };
-  const nonce = nacl.randomBytes(24);
-  const encrypted = nacl.box.after(
-    new TextEncoder().encode(JSON.stringify(payload)),
-    nonce,
-    sharedSecret
-  );
-  const url = new URL(signUrl);
-  url.searchParams.set("dapp_encryption_public_key", bs582.encode(keyPair.publicKey));
-  url.searchParams.set("nonce", bs582.encode(nonce));
-  url.searchParams.set("redirect_link", redirectUrl);
-  url.searchParams.set("payload", bs582.encode(encrypted));
-  return url.toString();
-};
 var parseSignMessageResponse = (config2, sessionKey) => {
   const params = new URLSearchParams(window.location.search);
   const nonce = params.get("nonce");
@@ -753,9 +712,48 @@ var createWcSolanaConnector = (config2) => {
   };
 };
 
+// src/lib/connectors/shared/download-only-connector.ts
+var createDownloadOnlySolanaConnector = (config2) => {
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
+  return {
+    ...walletConfig2,
+    type: "solana",
+    installed: false,
+    wallet: {
+      _provider: null,
+      connect: async () => {
+        return downloadOnlyResult();
+      },
+      disconnect: async () => {
+      },
+      signMessage: async () => {
+        throw new Error("Wallet is not installed");
+      }
+    }
+  };
+};
+var createDownloadOnlyEvmConnector = (config2) => {
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
+  return {
+    ...walletConfig2,
+    type: "evm",
+    installed: false,
+    wallet: {
+      _connector: null,
+      connect: async () => {
+        return downloadOnlyResult();
+      },
+      disconnect: async () => {
+      },
+      signMessage: async () => {
+        throw new Error("Wallet is not installed");
+      }
+    }
+  };
+};
+
 // src/lib/connectors/phantom.ts
 var PHANTOM_CONNECT_URL = "https://phantom.app/ul/v1/connect";
-var PHANTOM_SIGN_MESSAGE_URL = "https://phantom.app/ul/v1/signMessage";
 var PHANTOM_BROWSE_URL = "https://phantom.app/ul/browse";
 var createPhantomSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "phantom",
@@ -773,9 +771,9 @@ var STORAGE_KEYS2 = {
   SESSION: "phantom_mobile_session",
   SIGN_PENDING: "phantom_mobile_sign_pending"
 };
-var isInPhantom = () => isInWalletBrowser("isPhantom");
 var phantomWalletConfig = WALLETS.find((i) => i.id === "phantom");
-var createPhantomEvmConnector = () => ({
+var createPhantomEvmConnector = () => createDownloadOnlyEvmConnector({ walletId: "phantom" });
+var createPhantomEvmConnectorDeeplink = () => ({
   ...phantomWalletConfig,
   type: "evm",
   wallet: {
@@ -794,50 +792,7 @@ var createPhantomEvmConnector = () => ({
     }
   }
 });
-var createPhantomSolanaConnector = () => ({
-  ...phantomWalletConfig,
-  type: "solana",
-  wallet: {
-    _provider: null,
-    connect: async () => {
-      if (isInPhantom() && window.solana) {
-        return connectSolanaInjected();
-      }
-      storage.setString(STORAGE_KEYS2.PENDING, "1");
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?${PHANTOM_CONFIG.callbackParam}=1`;
-      window.location.href = buildConnectUrl(PHANTOM_CONFIG, {
-        appUrl: window.location.origin,
-        redirectUrl,
-        cluster: "mainnet-beta",
-        chain: "solana"
-      });
-      return pendingResult();
-    },
-    disconnect: async () => {
-      storage.remove(STORAGE_KEYS2.SESSION);
-    },
-    signMessage: async (message) => {
-      if (isInPhantom()) {
-        return signSolanaInjected(message);
-      }
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?phantom_sign_callback=1`;
-      const signUrl = buildSignMessageUrl(
-        PHANTOM_SIGN_MESSAGE_URL,
-        PHANTOM_CONFIG,
-        STORAGE_KEYS2.SESSION,
-        message,
-        redirectUrl
-      );
-      if (!signUrl) {
-        throw new Error("No Phantom session for signing");
-      }
-      storage.setString(STORAGE_KEYS2.SIGN_PENDING, "1");
-      window.location.href = signUrl;
-      return new Promise(() => {
-      });
-    }
-  }
-});
+var createPhantomSolanaConnector = () => createDownloadOnlySolanaConnector({ walletId: "phantom" });
 var isPhantomMobilePending = () => storage.getString(STORAGE_KEYS2.PENDING) === "1";
 var handlePhantomMobileCallback = () => handleMobileCallback(PHANTOM_CONFIG, STORAGE_KEYS2.PENDING, STORAGE_KEYS2.SESSION);
 var restorePhantomMobileSession = () => restoreMobileSession(STORAGE_KEYS2.SESSION);
@@ -869,7 +824,6 @@ 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 buildSolflareBrowseUrl = () => `https://solflare.com/ul/v1/browse/${encodeURIComponent(
   window.location.href
 )}?ref=${encodeURIComponent(window.location.origin)}`;
@@ -890,43 +844,7 @@ var STORAGE_KEYS3 = {
   SIGN_PENDING: "solflare_mobile_sign_pending"
 };
 var solflareWalletConfig = WALLETS.find((i) => i.id === "solflare");
-var createSolflareSolanaMobileConnector = () => ({
-  ...solflareWalletConfig,
-  type: "solana",
-  wallet: {
-    _provider: null,
-    connect: async () => {
-      storage.setString(STORAGE_KEYS3.PENDING, "1");
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?${SOLFLARE_CONFIG.callbackParam}=1`;
-      window.location.href = buildConnectUrl(SOLFLARE_CONFIG, {
-        appUrl: window.location.origin,
-        redirectUrl,
-        cluster: "mainnet-beta"
-      });
-      return pendingResult();
-    },
-    disconnect: async () => {
-      storage.remove(STORAGE_KEYS3.SESSION);
-    },
-    signMessage: async (message) => {
-      const redirectUrl = `${window.location.origin}${window.location.pathname}?solflare_sign_callback=1`;
-      const signUrl = buildSignMessageUrl(
-        SOLFLARE_SIGN_MESSAGE_URL,
-        SOLFLARE_CONFIG,
-        STORAGE_KEYS3.SESSION,
-        message,
-        redirectUrl
-      );
-      if (!signUrl) {
-        throw new Error("No Solflare session for signing");
-      }
-      storage.setString(STORAGE_KEYS3.SIGN_PENDING, "1");
-      window.location.href = signUrl;
-      return new Promise(() => {
-      });
-    }
-  }
-});
+var createSolflareSolanaMobileConnector = () => createDownloadOnlySolanaConnector({ walletId: "solflare" });
 var isSolflareMobilePending = () => storage.getString(STORAGE_KEYS3.PENDING) === "1";
 var handleSolflareMobileCallback = () => handleMobileCallback(SOLFLARE_CONFIG, STORAGE_KEYS3.PENDING, STORAGE_KEYS3.SESSION);
 var restoreSolflareMobileSession = () => restoreMobileSession(STORAGE_KEYS3.SESSION);
@@ -1098,7 +1016,10 @@ var createWalletConnectSolanaConnector = () => {
 
 // src/lib/evm/connectors.ts
 var EVM_FALLBACK_CONNECTORS = [
-  { id: "phantom", create: createPhantomEvmConnector },
+  {
+    id: "phantom",
+    create: isMobile() ? createPhantomEvmConnectorDeeplink : createPhantomEvmConnector
+  },
   { id: "metamask", create: createMetaMaskEvmConnector },
   { id: "trust", create: createTrustEvmMobileConnector },
   { id: "binance", create: createBinanceEvmConnector },
@@ -1364,8 +1285,13 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
 var getSolanaWallets = () => {
   const { get } = getWallets();
   const wallets = get();
+  const seenNames = /* @__PURE__ */ new Set();
   const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
-    return w.constructor.name !== "SolflareMetaMaskWallet";
+    if (w.constructor.name === "SolflareMetaMaskWallet") return false;
+    if (w.name === "MetaMask" && w.icon?.includes("9945ff")) return false;
+    if (seenNames.has(w.name)) return false;
+    seenNames.add(w.name);
+    return true;
   }).map(createSolanaConnector);
   console.log("wallets", { wallets });
   console.log("connectors", { connectors });

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

@@ -3,7 +3,9 @@ import type { EvmWalletConnector } from '../evm';
 import type { SolanaWalletConnector } from '../solana';
 export declare const createPhantomSolanaDappBrowserConnector: () => SolanaWalletConnector;
 export declare const createPhantomEvmConnector: () => EvmWalletConnector;
+export declare const createPhantomEvmConnectorDeeplink: () => EvmWalletConnector;
 export declare const createPhantomSolanaConnector: () => SolanaWalletConnector;
+export declare const createPhantomSolanaConnectorDeeplink: () => SolanaWalletConnector;
 export declare const isPhantomMobilePending: () => boolean;
 export declare const handlePhantomMobileCallback: () => ConnectedResult | null;
 export declare const restorePhantomMobileSession: () => ConnectedResult | null;

package/dist/lib/connectors/shared/download-only-connector.d.ts

@@ -0,0 +1,8 @@
+import type { EvmWalletConnector } from '../../evm';
+import type { SolanaWalletConnector } from '../../solana';
+import { type WalletId } from '../../wallets';
+export interface DownloadOnlyWalletConfig {
+    walletId: WalletId;
+}
+export declare const createDownloadOnlySolanaConnector: (config: DownloadOnlyWalletConfig) => SolanaWalletConnector;
+export declare const createDownloadOnlyEvmConnector: (config: DownloadOnlyWalletConfig) => EvmWalletConnector;

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

@@ -6,3 +6,4 @@ export * from './parsers';
 export * from './utils';
 export * from './walletconnect';
 export * from './wc-connector-factory';
+export * from './download-only-connector';

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

@@ -3,6 +3,7 @@ import type { SolanaWalletConnector } from '../solana';
 import { type StoredSession } from './shared';
 export declare const createSolflareSolanaDappBrowserConnector: () => SolanaWalletConnector;
 export declare const createSolflareSolanaMobileConnector: () => SolanaWalletConnector;
+export declare const createSolflareSolanaMobileConnectorDeeplink: () => SolanaWalletConnector;
 export declare const isSolflareMobilePending: () => boolean;
 export declare const handleSolflareMobileCallback: () => ConnectedResult | null;
 export declare const getSolflareMobileSession: () => StoredSession | null;

package/dist/lib/core/helpers.d.ts

@@ -1,7 +1,8 @@
-import type { ConnectedResult, PendingResult, QRCodeResult } from './types';
+import type { ConnectedResult, DownloadOnlyResult, PendingResult, QRCodeResult } from './types';
 export declare const connectedResult: (address: string, options?: {
     chainId?: number;
     publicKey?: Uint8Array;
 }) => ConnectedResult;
 export declare const qrcodeResult: (uri: string, wait: () => Promise<ConnectedResult>) => QRCodeResult;
 export declare const pendingResult: () => PendingResult;
+export declare const downloadOnlyResult: () => DownloadOnlyResult;

package/dist/lib/core/types.d.ts

@@ -16,7 +16,10 @@ export interface QRCodeResult {
 export interface PendingResult {
     status: 'pending';
 }
-export type ConnectResult = ConnectedResult | QRCodeResult | PendingResult;
+export interface DownloadOnlyResult {
+    status: 'downloadOnly';
+}
+export type ConnectResult = ConnectedResult | QRCodeResult | PendingResult | DownloadOnlyResult;
 export interface Wallet {
     connect: () => Promise<ConnectResult>;
     disconnect: () => Promise<void>;

package/package.json

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