@bit-buccaneers/wallet-abstraction 0.0.4 → 0.0.6

package/dist/dev.jsx

@@ -149,6 +149,11 @@ var WALLETS = [
     name: "Exodus",
     icon: "https://iconic.dynamic-static-assets.com/icons/sprite.svg#exodus",
     chromeExtensionUrl: "https://chromewebstore.google.com/detail/aholpfdialjgjfhomihkjbmgjidlcdno"
+  },
+  {
+    id: "walletconnect",
+    name: "WalletConnect",
+    icon: "https://iconic.dynamic-static-assets.com/icons/sprite.svg#walletconnect"
   }
 ];
 
@@ -200,8 +205,94 @@ var SOLANA_WC_CONFIG = {
   events: WC_EVENTS.SOLANA
 };
 
-// src/lib/connectors/shared/deeplink.ts
+// src/lib/connectors/shared/injected.ts
 import bs58 from "bs58";
+var connectEvmInjected = async () => {
+  if (!window.ethereum) throw new Error("No injected EVM provider");
+  const accounts = await window.ethereum.request({
+    method: "eth_requestAccounts"
+  });
+  if (!accounts[0]) throw new Error("No accounts returned");
+  const chainId = await window.ethereum.request({ method: "eth_chainId" });
+  return connectedResult(accounts[0], { chainId: parseInt(chainId, 16) });
+};
+var connectSolanaInjected = async () => {
+  if (!window.solana) throw new Error("No injected Solana provider");
+  const response = await window.solana.connect();
+  const publicKey = response.publicKey;
+  return connectedResult(publicKey.toBase58(), { publicKey: publicKey.toBytes() });
+};
+var signSolanaInjected = async (message) => {
+  if (!window.solana?.signMessage) {
+    throw new Error("No injected Solana provider or signMessage not supported");
+  }
+  const encodedMessage = new TextEncoder().encode(message);
+  const result = await window.solana.signMessage(encodedMessage, "utf8");
+  return bs58.encode(new Uint8Array(result.signature));
+};
+
+// src/lib/connectors/shared/utils.ts
+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];
+};
+var openDeeplink = (url) => {
+  const link = document.createElement("a");
+  link.href = url;
+  link.click();
+};
+var waitForValue = (getValue) => {
+  return new Promise((resolve) => {
+    const check = () => {
+      const value = getValue();
+      if (value != null) resolve(value);
+      else window.setTimeout(check, 50);
+    };
+    check();
+  });
+};
+
+// src/lib/connectors/shared/dapp-browser.ts
+var buildBrowseUrl = (baseUrl, stripProtocol) => {
+  if (stripProtocol) {
+    return `${baseUrl}/${window.location.host}${window.location.pathname}${window.location.search}`;
+  }
+  return `${baseUrl}/${encodeURIComponent(window.location.href)}`;
+};
+var createDappBrowserSolanaConnector = (config2) => {
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
+  const isInWallet = () => isInWalletBrowser(config2.injectedKey);
+  return {
+    ...walletConfig2,
+    type: "solana",
+    wallet: {
+      _provider: null,
+      connect: async () => {
+        if (isInWallet() && window.solana) {
+          return connectSolanaInjected();
+        }
+        window.location.href = buildBrowseUrl(config2.browseUrl, config2.stripProtocol);
+        return pendingResult();
+      },
+      disconnect: async () => {
+        if (window.solana?.disconnect) {
+          await window.solana.disconnect();
+        }
+      },
+      signMessage: async (message) => {
+        if (isInWallet() && window.solana) {
+          return signSolanaInjected(message);
+        }
+        throw new Error("signMessage requires dApp browser");
+      }
+    }
+  };
+};
+
+// src/lib/connectors/shared/deeplink.ts
+import bs582 from "bs58";
 import nacl from "tweetnacl";
 var getDappKeyPair = (storageKey) => {
   const stored = storage.get(storageKey);
@@ -222,7 +313,7 @@ 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", bs58.encode(keyPair.publicKey));
+  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);
@@ -241,8 +332,8 @@ var parseConnectResponse = (urlParams, config2) => {
   }
   try {
     const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
-    const sharedSecret = nacl.box.before(bs58.decode(walletPublicKey), keyPair.secretKey);
-    const decrypted = nacl.box.open.after(bs58.decode(data), bs58.decode(nonce), sharedSecret);
+    const sharedSecret = nacl.box.before(bs582.decode(walletPublicKey), keyPair.secretKey);
+    const decrypted = nacl.box.open.after(bs582.decode(data), bs582.decode(nonce), sharedSecret);
     if (!decrypted) {
       return null;
     }
@@ -292,7 +383,7 @@ var buildSignMessageUrl = (signUrl, config2, sessionKey, message, redirectUrl) =
   const keyPair = getDappKeyPair(`${config2.storageKeyPrefix}_keypair`);
   const sharedSecret = new Uint8Array(session.sharedSecret);
   const payload = {
-    message: bs58.encode(new TextEncoder().encode(message)),
+    message: bs582.encode(new TextEncoder().encode(message)),
     session: session.session,
     display: "utf8"
   };
@@ -303,10 +394,10 @@ var buildSignMessageUrl = (signUrl, config2, sessionKey, message, redirectUrl) =
     sharedSecret
   );
   const url = new URL(signUrl);
-  url.searchParams.set("dapp_encryption_public_key", bs58.encode(keyPair.publicKey));
-  url.searchParams.set("nonce", bs58.encode(nonce));
+  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", bs58.encode(encrypted));
+  url.searchParams.set("payload", bs582.encode(encrypted));
   return url.toString();
 };
 var parseSignMessageResponse = (config2, sessionKey) => {
@@ -318,7 +409,7 @@ var parseSignMessageResponse = (config2, sessionKey) => {
   if (!session) return null;
   try {
     const sharedSecret = new Uint8Array(session.sharedSecret);
-    const decrypted = nacl.box.open.after(bs58.decode(data), bs58.decode(nonce), sharedSecret);
+    const decrypted = nacl.box.open.after(bs582.decode(data), bs582.decode(nonce), sharedSecret);
     if (!decrypted) return null;
     const response = JSON.parse(new TextDecoder().decode(decrypted));
     return response.signature;
@@ -327,32 +418,6 @@ var parseSignMessageResponse = (config2, sessionKey) => {
   }
 };
 
-// src/lib/connectors/shared/injected.ts
-import bs582 from "bs58";
-var connectEvmInjected = async () => {
-  if (!window.ethereum) throw new Error("No injected EVM provider");
-  const accounts = await window.ethereum.request({
-    method: "eth_requestAccounts"
-  });
-  if (!accounts[0]) throw new Error("No accounts returned");
-  const chainId = await window.ethereum.request({ method: "eth_chainId" });
-  return connectedResult(accounts[0], { chainId: parseInt(chainId, 16) });
-};
-var connectSolanaInjected = async () => {
-  if (!window.solana) throw new Error("No injected Solana provider");
-  const response = await window.solana.connect();
-  const publicKey = response.publicKey;
-  return connectedResult(publicKey.toBase58(), { publicKey: publicKey.toBytes() });
-};
-var signSolanaInjected = async (message) => {
-  if (!window.solana?.signMessage) {
-    throw new Error("No injected Solana provider or signMessage not supported");
-  }
-  const encodedMessage = new TextEncoder().encode(message);
-  const result = await window.solana.signMessage(encodedMessage, "utf8");
-  return bs582.encode(new Uint8Array(result.signature));
-};
-
 // src/lib/connectors/shared/parsers.ts
 var parseEvmAccount = (account) => {
   const [, chainIdStr, address] = account.split(":");
@@ -362,8 +427,8 @@ var parseEvmAccount = (account) => {
 var parseSolanaAccount = async (account) => {
   const address = account.split(":")[2];
   if (!address) throw new Error("Invalid Solana account format");
-  const { default: bs586 } = await import("bs58");
-  return connectedResult(address, { publicKey: bs586.decode(address) });
+  const { default: bs587 } = await import("bs58");
+  return connectedResult(address, { publicKey: bs587.decode(address) });
 };
 var getEvmAccountFromSession = (namespaces) => {
   const account = namespaces.eip155?.accounts?.[0];
@@ -376,29 +441,6 @@ var getSolanaAccountFromSession = async (namespaces) => {
   return parseSolanaAccount(account);
 };
 
-// src/lib/connectors/shared/utils.ts
-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];
-};
-var openDeeplink = (url) => {
-  const link = document.createElement("a");
-  link.href = url;
-  link.click();
-};
-var waitForValue = (getValue) => {
-  return new Promise((resolve) => {
-    const check = () => {
-      const value = getValue();
-      if (value != null) resolve(value);
-      else window.setTimeout(check, 50);
-    };
-    check();
-  });
-};
-
 // src/lib/walletconnect/client.ts
 import { SignClient } from "@walletconnect/sign-client";
 var signClient = null;
@@ -573,11 +615,11 @@ var disconnectWcOrSolana = async () => {
   }
 };
 var createWcEvmConnector = (config2) => {
-  const walletConfig = WALLETS.find((w) => w.id === config2.walletId);
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
   const getDeeplink = createDeeplink(config2.wcDeeplink);
   const isInWallet = () => isInWalletBrowser(config2.injectedKey);
   return {
-    ...walletConfig,
+    ...walletConfig2,
     type: "evm",
     wallet: {
       _connector: null,
@@ -618,11 +660,11 @@ var createWcEvmConnector = (config2) => {
   };
 };
 var createWcSolanaConnector = (config2) => {
-  const walletConfig = WALLETS.find((w) => w.id === config2.walletId);
+  const walletConfig2 = WALLETS.find((w) => w.id === config2.walletId);
   const getDeeplink = createDeeplink(config2.wcDeeplink);
   const isInWallet = () => isInWalletBrowser(config2.injectedKey);
   return {
-    ...walletConfig,
+    ...walletConfig2,
     type: "solana",
     wallet: {
       _provider: null,
@@ -662,6 +704,11 @@ var createWcSolanaConnector = (config2) => {
 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",
+  browseUrl: PHANTOM_BROWSE_URL,
+  injectedKey: "isPhantom"
+});
 var PHANTOM_CONFIG = {
   connectUrl: PHANTOM_CONNECT_URL,
   storageKeyPrefix: "phantom_mobile",
@@ -758,11 +805,24 @@ var METAMASK_CONFIG = {
   wcDeeplink: "https://metamask.app.link/wc",
   injectedKey: "isMetaMask"
 };
+var METAMASK_BROWSE_URL = "https://metamask.app.link/dapp";
 var createMetaMaskEvmConnector = () => createWcEvmConnector(METAMASK_CONFIG);
+var createMetaMaskSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
+  walletId: "metamask",
+  browseUrl: METAMASK_BROWSE_URL,
+  injectedKey: "isMetaMask",
+  stripProtocol: true
+});
 
 // 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 createSolflareSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
+  walletId: "solflare",
+  browseUrl: SOLFLARE_BROWSE_URL,
+  injectedKey: "isSolflare"
+});
 var SOLFLARE_CONFIG = {
   connectUrl: SOLFLARE_CONNECT_URL,
   storageKeyPrefix: "solflare_mobile",
@@ -832,8 +892,14 @@ var TRUST_CONFIG = {
   wcDeeplink: "https://link.trustwallet.com/wc",
   injectedKey: "isTrust"
 };
+var TRUST_BROWSE_URL = "https://link.trustwallet.com/open_url";
 var createTrustEvmMobileConnector = () => createWcEvmConnector(TRUST_CONFIG);
 var createTrustSolanaMobileConnector = () => createWcSolanaConnector(TRUST_CONFIG);
+var createTrustSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
+  walletId: "trust",
+  browseUrl: TRUST_BROWSE_URL,
+  injectedKey: "isTrust"
+});
 
 // src/lib/connectors/rainbow.ts
 var RAINBOW_CONFIG = {
@@ -849,8 +915,14 @@ 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 = {
@@ -858,8 +930,118 @@ var BINANCE_CONFIG = {
   wcDeeplink: "bnc://app.binance.com/cedefi/wc",
   injectedKey: "isBinance"
 };
+var BINANCE_BROWSE_URL = "bnc://app.binance.com/cedefi/dapp/browser";
 var createBinanceEvmConnector = () => createWcEvmConnector(BINANCE_CONFIG);
 var createBinanceSolanaConnector = () => createWcSolanaConnector(BINANCE_CONFIG);
+var createBinanceSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
+  walletId: "binance",
+  browseUrl: BINANCE_BROWSE_URL,
+  injectedKey: "isBinance"
+});
+
+// src/lib/connectors/okx.ts
+var OKX_BROWSE_URL = "https://www.okx.com/download?deeplink=";
+var createOkxSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
+  walletId: "okx",
+  browseUrl: OKX_BROWSE_URL,
+  injectedKey: "isOkxWallet"
+});
+
+// src/lib/connectors/coinbase.ts
+var COINBASE_BROWSE_URL = "https://go.cb-w.com/dapp";
+var createCoinbaseSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
+  walletId: "coinbase",
+  browseUrl: COINBASE_BROWSE_URL,
+  injectedKey: "isCoinbaseWallet",
+  stripProtocol: true
+});
+
+// src/lib/connectors/bitget.ts
+var BITGET_BROWSE_URL = "https://bkcode.vip/dapp";
+var createBitgetSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
+  walletId: "bitget",
+  browseUrl: BITGET_BROWSE_URL,
+  injectedKey: "isBitKeep",
+  stripProtocol: true
+});
+
+// src/lib/connectors/walletconnect.ts
+import bs584 from "bs58";
+var walletConfig = WALLETS.find((w) => w.id === "walletconnect");
+var disconnectWc2 = async () => {
+  if (getCurrentSession()) {
+    await disconnectWalletConnect();
+  }
+};
+var createWalletConnectEvmConnector = () => {
+  if (isMobile()) return null;
+  return {
+    id: walletConfig.id,
+    name: walletConfig.name,
+    icon: walletConfig.icon,
+    type: "evm",
+    installed: true,
+    wallet: {
+      _connector: null,
+      connect: async () => {
+        return connectViaWalletConnect(EVM_WC_CONFIG, getEvmAccountFromSession);
+      },
+      disconnect: disconnectWc2,
+      signMessage: async (message) => {
+        const session = getCurrentSession();
+        if (!session) {
+          throw new Error("No WalletConnect session");
+        }
+        const account = session.namespaces.eip155?.accounts?.[0];
+        if (!account) {
+          throw new Error("No EVM account in session");
+        }
+        const address = account.split(":")[2];
+        const result = await requestWalletConnect(
+          "personal_sign",
+          [message, address],
+          WC_CHAINS.EVM_MAINNET
+        );
+        return result;
+      }
+    }
+  };
+};
+var createWalletConnectSolanaConnector = () => {
+  if (isMobile()) return null;
+  return {
+    id: walletConfig.id,
+    name: walletConfig.name,
+    icon: walletConfig.icon,
+    type: "solana",
+    installed: true,
+    wallet: {
+      _provider: null,
+      connect: async () => {
+        return connectViaWalletConnect(SOLANA_WC_CONFIG, getSolanaAccountFromSession);
+      },
+      disconnect: disconnectWc2,
+      signMessage: async (message) => {
+        const session = getCurrentSession();
+        if (!session) {
+          throw new Error("No WalletConnect session");
+        }
+        const account = session.namespaces.solana?.accounts?.[0];
+        if (!account) {
+          throw new Error("No Solana account in session");
+        }
+        const pubkey = account.split(":")[2];
+        const messageBytes = new TextEncoder().encode(message);
+        const result = await requestWalletConnect(
+          "solana_signMessage",
+          { message: bs584.encode(messageBytes), pubkey },
+          WC_CHAINS.SOLANA_MAINNET
+        );
+        return result.signature;
+      }
+    }
+  };
+};
 
 // src/lib/evm/connectors.ts
 var EVM_FALLBACK_CONNECTORS = [
@@ -929,7 +1111,7 @@ import {
   isWalletAdapterCompatibleStandardWallet
 } from "@solana/wallet-adapter-base";
 import { getWallets } from "@wallet-standard/app";
-import bs584 from "bs58";
+import bs585 from "bs58";
 var createSolanaConnector = (provider) => {
   const id = normalizeSolanaWalletId(provider.name.toLowerCase().replace(/\s+/g, "-"));
   const connector = {
@@ -973,7 +1155,7 @@ var createSolanaConnector = (provider) => {
         const result = await signFeature.signMessage({ message: encodedMessage, account });
         const signature = result[0]?.signature;
         if (!signature) throw new Error("No signature returned");
-        return bs584.encode(signature);
+        return bs585.encode(signature);
       }
     }
   };
@@ -990,16 +1172,59 @@ var createSolanaMobileConnector = (connector) => ({
     }
   }
 });
-var SOLANA_FALLBACK_CONNECTORS = [
+var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
+  {
+    id: "phantom",
+    create: () => createSolanaMobileConnector(createPhantomSolanaDappBrowserConnector())
+  },
+  {
+    id: "solflare",
+    create: () => createSolanaMobileConnector(createSolflareSolanaDappBrowserConnector())
+  },
+  {
+    id: "metamask",
+    create: () => createSolanaMobileConnector(createMetaMaskSolanaDappBrowserConnector())
+  },
+  {
+    id: "okx",
+    create: () => createSolanaMobileConnector(createOkxSolanaDappBrowserConnector())
+  },
+  {
+    id: "coinbase",
+    create: () => createSolanaMobileConnector(createCoinbaseSolanaDappBrowserConnector())
+  },
+  {
+    id: "bitget",
+    create: () => createSolanaMobileConnector(createBitgetSolanaDappBrowserConnector())
+  },
+  {
+    id: "trust",
+    create: () => createSolanaMobileConnector(createTrustSolanaDappBrowserConnector())
+  },
+  {
+    id: "binance",
+    create: () => createSolanaMobileConnector(createBinanceSolanaDappBrowserConnector())
+  },
+  {
+    id: "exodus",
+    create: () => createSolanaMobileConnector(createExodusSolanaDappBrowserConnector())
+  }
+] : [
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
   // { id: 'metamask', create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector()) },
   {
     id: "solflare",
     create: () => createSolanaMobileConnector(createSolflareSolanaMobileConnector())
   },
-  { id: "trust", create: () => createSolanaMobileConnector(createTrustSolanaMobileConnector()) },
+  {
+    id: "trust",
+    create: () => createSolanaMobileConnector(createTrustSolanaMobileConnector())
+  },
   { id: "binance", create: () => createSolanaMobileConnector(createBinanceSolanaConnector()) },
-  { id: "exodus", create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector()) }
+  {
+    id: "exodus",
+    create: () => createSolanaMobileConnector(createExodusSolanaMobileConnector())
+  }
 ];
 var getSolanaWallets = () => {
   const { get } = getWallets();
@@ -1109,7 +1334,12 @@ var useEvmWallet = (options) => {
   const [connectedConnector, setConnectedConnector] = createSignal(null);
   onMount(() => {
     createEvmConfig(options.chains);
-    setEvmConnectors(getEvmConnectors());
+    const connectors = getEvmConnectors();
+    const wcConnector = createWalletConnectEvmConnector();
+    if (wcConnector) {
+      connectors.unshift(wcConnector);
+    }
+    setEvmConnectors(connectors);
     const unsubscribe = watchEvmConnections((connections) => {
       const connection = connections[0];
       if (connection && connection.accounts[0]) {
@@ -1158,7 +1388,12 @@ var useSolanaWallet = () => {
     null
   );
   onMount2(() => {
-    setSolanaConnectors(getSolanaWallets());
+    const connectors = getSolanaWallets();
+    const wcConnector = createWalletConnectSolanaConnector();
+    if (wcConnector) {
+      connectors.unshift(wcConnector);
+    }
+    setSolanaConnectors(connectors);
     const unsubscribeWallets = onSolanaWalletsChange(setSolanaConnectors);
     const unsubscribeConnection = watchSolanaConnection((state) => {
       setSolanaConnection(state.connection);
@@ -1211,7 +1446,7 @@ var useSolanaWallet = () => {
 };
 
 // src/lib/context/hooks/useWalletConnect.ts
-import bs585 from "bs58";
+import bs586 from "bs58";
 import { onCleanup as onCleanup3, onMount as onMount3 } from "solid-js";
 var useWalletConnect = (options) => {
   onMount3(async () => {
@@ -1266,7 +1501,7 @@ var useWalletConnect = (options) => {
     const messageBytes = new TextEncoder().encode(message);
     const result = await requestWalletConnect(
       "solana_signMessage",
-      { message: bs585.encode(messageBytes), pubkey },
+      { message: bs586.encode(messageBytes), pubkey },
       WC_CHAINS.SOLANA_MAINNET
     );
     return result.signature;
@@ -1373,11 +1608,13 @@ export {
   checkPhantomSignCallback,
   checkSolflareSignCallback,
   createEvmConfig,
+  getCurrentSession,
   getEvmConfig,
   getEvmConnectors,
   getSolanaWallets,
   initWalletConnect,
   onSolanaWalletsChange,
+  onWalletConnectSessionChange,
   reconnectSolana,
   useWallet,
   watchEvmConnections,