@bit-buccaneers/wallet-abstraction 0.0.16 → 0.0.18

package/dist/dev.jsx

@@ -383,8 +383,8 @@ var parseEvmAccount = (account) => {
 var parseSolanaAccount = async (account) => {
   const address = account.split(":")[2];
   if (!address) throw new Error("Invalid Solana account format");
-  const { default: bs587 } = await import("bs58");
-  return connectedResult(address, { publicKey: bs587.decode(address) });
+  const { default: bs588 } = await import("bs58");
+  return connectedResult(address, { publicKey: bs588.decode(address) });
 };
 var getEvmAccountFromSession = (namespaces) => {
   const account = namespaces.eip155?.accounts?.[0];
@@ -807,6 +807,7 @@ var METAMASK_CONFIG = {
 };
 var METAMASK_BROWSE_URL = "https://metamask.app.link/dapp";
 var createMetaMaskEvmConnector = () => createWcEvmConnector(METAMASK_CONFIG);
+var createMetaMaskSolanaConnector = () => createDownloadOnlySolanaConnector({ walletId: "metamask" });
 var createMetaMaskSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "metamask",
   browseUrl: METAMASK_BROWSE_URL,
@@ -908,242 +909,8 @@ var createOkxSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector
 });
 
 // src/lib/connectors/coinbase.ts
-var buildCoinbaseBrowseUrl = () => `cbwallet://dapp?url=${encodeURIComponent(window.location.href)}`;
-var createCoinbaseSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
-  walletId: "coinbase",
-  injectedKey: "isCoinbaseWallet",
-  buildUrl: buildCoinbaseBrowseUrl
-});
-
-// src/lib/connectors/bitget.ts
-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",
-  injectedKey: "isBitKeep",
-  buildUrl: buildBitgetBrowseUrl
-});
-
-// 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 = () => {
-  return {
-    id: walletConfig.id,
-    name: walletConfig.name,
-    icon: walletConfig.icon,
-    type: "evm",
-    installed: false,
-    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 = () => {
-  return {
-    id: walletConfig.id,
-    name: walletConfig.name,
-    icon: walletConfig.icon,
-    type: "solana",
-    installed: false,
-    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 = [
-  {
-    id: "phantom",
-    create: isMobile() ? createPhantomEvmConnectorDeeplink : createPhantomEvmConnector
-  },
-  ...isMobile() ? [] : [{ id: "metamask", create: createMetaMaskEvmConnector }],
-  { id: "trust", create: createTrustEvmMobileConnector },
-  { id: "binance", create: createBinanceEvmConnector },
-  { id: "okx", create: createOkxEvmConnector },
-  { id: "rainbow", create: createRainbowEvmMobileConnector },
-  ...isMobile() ? [] : [{ id: "rabby", create: createRabbyEvmConnector }]
-];
-var sleep = (ms) => new Promise((r) => window.setTimeout(r, ms));
-var checkEvmWalletInstalled = (connectorId) => {
-  if (typeof window === "undefined" || !window.ethereum) return false;
-  const providers = window.ethereum.providers ?? [window.ethereum];
-  switch (connectorId) {
-    case "metaMaskSDK":
-      return providers.some((p) => p.isMetaMask && !p.isBraveWallet);
-    case "coinbaseWalletSDK":
-      return providers.some((p) => p.isCoinbaseWallet);
-    default:
-      return true;
-  }
-};
-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) => ({
-    id: normalizeEvmWalletId(c.id),
-    name: c.name,
-    icon: c.icon,
-    type: "evm",
-    installed: checkEvmWalletInstalled(c.id),
-    wallet: {
-      _connector: c,
-      connect: async () => {
-        try {
-          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 });
-        } catch (err) {
-          if (err instanceof Error && err.name === "ConnectorAlreadyConnectedError") {
-            cleanupWalletLocalStorage();
-            await disconnect(getEvmConfig(), { connector: c });
-            await sleep(100);
-            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 });
-          }
-          throw err;
-        }
-      },
-      disconnect: async () => {
-        cleanupWalletLocalStorage();
-        await disconnect(getEvmConfig());
-      },
-      signMessage: async (message) => {
-        return wagmiSignMessage(getEvmConfig(), { message });
-      }
-    }
-  }));
-  addFallbackConnectors(connectors, EVM_FALLBACK_CONNECTORS);
-  return connectors;
-};
-
-// src/lib/evm/connection.ts
-import { watchConnections } from "@wagmi/core";
-var watchEvmConnections = (onChange) => {
-  return watchConnections(getEvmConfig(), { onChange });
-};
-
-// src/lib/evm/transactions.ts
-import {
-  sendTransaction as wagmiSendTransaction,
-  switchChain as wagmiSwitchChain,
-  waitForTransactionReceipt as wagmiWaitForReceipt
-} from "@wagmi/core";
-var switchChain = async (chainId) => {
-  await wagmiSwitchChain(getEvmConfig(), { chainId });
-};
-var sendTransaction = async (params) => {
-  const hash = await wagmiSendTransaction(getEvmConfig(), {
-    to: params.to,
-    value: params.value,
-    data: params.data
-  });
-  return { hash };
-};
-var waitForTransactionReceipt = async (hash) => {
-  const receipt = await wagmiWaitForReceipt(getEvmConfig(), { hash });
-  return {
-    hash: receipt.transactionHash,
-    status: receipt.status,
-    blockNumber: receipt.blockNumber
-  };
-};
-
-// src/lib/evm/erc20.ts
-import { readContract, writeContract } from "@wagmi/core";
-import { erc20Abi } from "viem";
-var getAllowance = async (params) => {
-  return readContract(getEvmConfig(), {
-    abi: erc20Abi,
-    address: params.tokenAddress,
-    functionName: "allowance",
-    args: [params.owner, params.spender]
-  });
-};
-var approve = async (params) => {
-  const hash = await writeContract(getEvmConfig(), {
-    address: params.tokenAddress,
-    abi: erc20Abi,
-    functionName: "approve",
-    args: [params.spender, params.amount]
-  });
-  return waitForTransactionReceipt(hash);
-};
-var ensureAllowance = async (params) => {
-  const currentAllowance = await getAllowance({
-    tokenAddress: params.tokenAddress,
-    owner: params.owner,
-    spender: params.spender
-  });
-  if (currentAllowance >= params.amount) {
-    return null;
-  }
-  if (currentAllowance > 0n) {
-    await approve({
-      tokenAddress: params.tokenAddress,
-      spender: params.spender,
-      amount: 0n
-    });
-  }
-  return approve(params);
-};
+import { CoinbaseWalletAdapter } from "@solana/wallet-adapter-coinbase";
+import bs585 from "bs58";
 
 // src/lib/solana/connection.ts
 var currentConnection = {
@@ -1171,7 +938,7 @@ import {
   isWalletAdapterCompatibleStandardWallet
 } from "@solana/wallet-adapter-base";
 import { getWallets } from "@wallet-standard/app";
-import bs585 from "bs58";
+import bs584 from "bs58";
 var createSolanaConnector = (provider) => {
   const id = normalizeSolanaWalletId(provider.name.toLowerCase().replace(/\s+/g, "-"));
   const connector = {
@@ -1215,7 +982,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 bs585.encode(signature);
+        return bs584.encode(signature);
       }
     }
   };
@@ -1266,6 +1033,10 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createBinanceSolanaDappBrowserConnector())
   }
 ] : [
+  {
+    id: "metamask",
+    create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector())
+  },
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
   {
     id: "solflare",
@@ -1276,8 +1047,12 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createTrustSolanaMobileConnector())
   },
   { id: "binance", create: () => createSolanaMobileConnector(createBinanceSolanaConnector()) },
-  { id: "bitget", create: createBitgetSolanaConnector },
-  { id: "okx", create: createOkxSolanaConnector }
+  { id: "bitget", create: () => createSolanaMobileConnector(createBitgetSolanaConnector()) },
+  { id: "okx", create: () => createSolanaMobileConnector(createOkxSolanaConnector()) },
+  {
+    id: "coinbase",
+    create: () => createSolanaMobileConnector(createCoinbaseSolanaConnector())
+  }
 ];
 var getSolanaWallets = () => {
   const { get } = getWallets();
@@ -1383,6 +1158,283 @@ var checkSolflareSignCallback = () => {
   return handleSolflareSignCallback();
 };
 
+// src/lib/connectors/coinbase.ts
+var buildCoinbaseBrowseUrl = () => `cbwallet://dapp?url=${encodeURIComponent(window.location.href)}`;
+var createCoinbaseSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
+  walletId: "coinbase",
+  injectedKey: "isCoinbaseWallet",
+  buildUrl: buildCoinbaseBrowseUrl
+});
+var createCoinbaseSolanaConnector = () => {
+  const walletConfig2 = WALLETS.find((w) => w.id === "coinbase");
+  const adapter = new CoinbaseWalletAdapter();
+  const connector = {
+    id: "coinbase",
+    name: walletConfig2.name,
+    icon: walletConfig2.icon,
+    type: "solana",
+    installed: adapter.readyState === "Installed",
+    wallet: {
+      _provider: adapter,
+      connect: async () => {
+        await adapter.connect();
+        if (!adapter.publicKey) {
+          throw new Error("No public key returned from Coinbase Wallet");
+        }
+        const address = adapter.publicKey.toBase58();
+        const result = connectedResult(address, {
+          publicKey: adapter.publicKey.toBytes()
+        });
+        storage.setString(STORAGE_KEYS.SOLANA_WALLET, "coinbase");
+        setConnection(result, connector);
+        return result;
+      },
+      disconnect: async () => {
+        await adapter.disconnect();
+      },
+      signMessage: async (message) => {
+        const encodedMessage = new TextEncoder().encode(message);
+        const signature = await adapter.signMessage(encodedMessage);
+        return bs585.encode(signature);
+      }
+    }
+  };
+  return connector;
+};
+
+// src/lib/connectors/bitget.ts
+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",
+  injectedKey: "isBitKeep",
+  buildUrl: buildBitgetBrowseUrl
+});
+
+// src/lib/connectors/walletconnect.ts
+import bs586 from "bs58";
+var walletConfig = WALLETS.find((w) => w.id === "walletconnect");
+var disconnectWc2 = async () => {
+  if (getCurrentSession()) {
+    await disconnectWalletConnect();
+  }
+};
+var createWalletConnectEvmConnector = () => {
+  return {
+    id: walletConfig.id,
+    name: walletConfig.name,
+    icon: walletConfig.icon,
+    type: "evm",
+    installed: false,
+    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 = () => {
+  return {
+    id: walletConfig.id,
+    name: walletConfig.name,
+    icon: walletConfig.icon,
+    type: "solana",
+    installed: false,
+    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: bs586.encode(messageBytes), pubkey },
+          WC_CHAINS.SOLANA_MAINNET
+        );
+        return result.signature;
+      }
+    }
+  };
+};
+
+// src/lib/evm/connectors.ts
+var EVM_FALLBACK_CONNECTORS = [
+  {
+    id: "phantom",
+    create: isMobile() ? createPhantomEvmConnectorDeeplink : createPhantomEvmConnector
+  },
+  ...isMobile() ? [] : [{ id: "metamask", create: createMetaMaskEvmConnector }],
+  { id: "trust", create: createTrustEvmMobileConnector },
+  { id: "binance", create: createBinanceEvmConnector },
+  { id: "okx", create: createOkxEvmConnector },
+  { id: "rainbow", create: createRainbowEvmMobileConnector },
+  ...isMobile() ? [] : [{ id: "rabby", create: createRabbyEvmConnector }]
+];
+var sleep = (ms) => new Promise((r) => window.setTimeout(r, ms));
+var checkEvmWalletInstalled = (connectorId) => {
+  if (typeof window === "undefined") return false;
+  const providers = window.ethereum?.providers ?? (window.ethereum ? [window.ethereum] : []);
+  switch (connectorId) {
+    case "metaMaskSDK":
+      return providers.some((p) => p.isMetaMask && !p.isBraveWallet);
+    case "coinbaseWalletSDK":
+      if ("coinbaseWalletExtension" in window) return true;
+      return providers.some(
+        (p) => p.isCoinbaseWallet || p.isCoinbaseBrowser
+      );
+    default:
+      return true;
+  }
+};
+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) => ({
+    id: normalizeEvmWalletId(c.id),
+    name: c.name,
+    icon: c.icon,
+    type: "evm",
+    installed: checkEvmWalletInstalled(c.id),
+    wallet: {
+      _connector: c,
+      connect: async () => {
+        try {
+          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 });
+        } catch (err) {
+          if (err instanceof Error && err.name === "ConnectorAlreadyConnectedError") {
+            cleanupWalletLocalStorage();
+            await disconnect(getEvmConfig(), { connector: c });
+            await sleep(100);
+            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 });
+          }
+          throw err;
+        }
+      },
+      disconnect: async () => {
+        cleanupWalletLocalStorage();
+        await disconnect(getEvmConfig());
+      },
+      signMessage: async (message) => {
+        return wagmiSignMessage(getEvmConfig(), { message });
+      }
+    }
+  }));
+  addFallbackConnectors(connectors, EVM_FALLBACK_CONNECTORS);
+  return connectors;
+};
+
+// src/lib/evm/connection.ts
+import { watchConnections } from "@wagmi/core";
+var watchEvmConnections = (onChange) => {
+  return watchConnections(getEvmConfig(), { onChange });
+};
+
+// src/lib/evm/transactions.ts
+import {
+  sendTransaction as wagmiSendTransaction,
+  switchChain as wagmiSwitchChain,
+  waitForTransactionReceipt as wagmiWaitForReceipt
+} from "@wagmi/core";
+var switchChain = async (chainId) => {
+  await wagmiSwitchChain(getEvmConfig(), { chainId });
+};
+var sendTransaction = async (params) => {
+  const hash = await wagmiSendTransaction(getEvmConfig(), {
+    to: params.to,
+    value: params.value,
+    data: params.data
+  });
+  return { hash };
+};
+var waitForTransactionReceipt = async (hash) => {
+  const receipt = await wagmiWaitForReceipt(getEvmConfig(), { hash });
+  return {
+    hash: receipt.transactionHash,
+    status: receipt.status,
+    blockNumber: receipt.blockNumber
+  };
+};
+
+// src/lib/evm/erc20.ts
+import { readContract, writeContract } from "@wagmi/core";
+import { erc20Abi } from "viem";
+var getAllowance = async (params) => {
+  return readContract(getEvmConfig(), {
+    abi: erc20Abi,
+    address: params.tokenAddress,
+    functionName: "allowance",
+    args: [params.owner, params.spender]
+  });
+};
+var approve = async (params) => {
+  const hash = await writeContract(getEvmConfig(), {
+    address: params.tokenAddress,
+    abi: erc20Abi,
+    functionName: "approve",
+    args: [params.spender, params.amount]
+  });
+  return waitForTransactionReceipt(hash);
+};
+var ensureAllowance = async (params) => {
+  const currentAllowance = await getAllowance({
+    tokenAddress: params.tokenAddress,
+    owner: params.owner,
+    spender: params.spender
+  });
+  if (currentAllowance >= params.amount) {
+    return null;
+  }
+  if (currentAllowance > 0n) {
+    await approve({
+      tokenAddress: params.tokenAddress,
+      spender: params.spender,
+      amount: 0n
+    });
+  }
+  return approve(params);
+};
+
 // src/lib/context/WalletContext.tsx
 import { createContext, useContext } from "solid-js";
 
@@ -1563,7 +1615,7 @@ var useSolanaWallet = () => {
 };
 
 // src/lib/context/hooks/useWalletConnect.ts
-import bs586 from "bs58";
+import bs587 from "bs58";
 import { onCleanup as onCleanup3, onMount as onMount3 } from "solid-js";
 var useWalletConnect = (options) => {
   onMount3(async () => {
@@ -1618,7 +1670,7 @@ var useWalletConnect = (options) => {
     const messageBytes = new TextEncoder().encode(message);
     const result = await requestWalletConnect(
       "solana_signMessage",
-      { message: bs586.encode(messageBytes), pubkey },
+      { message: bs587.encode(messageBytes), pubkey },
       WC_CHAINS.SOLANA_MAINNET
     );
     return result.signature;