@bit-buccaneers/wallet-abstraction 0.0.10 → 0.0.12

package/dist/dev.js

@@ -1,6 +1,6 @@
 import { injected, metaMask, coinbaseWallet } from '@wagmi/connectors';
-import { createConfig, getConnectors, signMessage, disconnect, getConnections, connect, watchConnections } from '@wagmi/core';
-import { http } from 'viem';
+import { createConfig, getConnectors, signMessage, disconnect, connect, watchConnections, switchChain as switchChain$1, sendTransaction as sendTransaction$1, waitForTransactionReceipt as waitForTransactionReceipt$1, readContract, writeContract } from '@wagmi/core';
+import { http, erc20Abi } from 'viem';
 import { mainnet } from 'viem/chains';
 import bs582 from 'bs58';
 import nacl from 'tweetnacl';
@@ -165,7 +165,6 @@ var WALLETS = [
 // src/lib/wallets/mappers.ts
 var EVM_WALLET_ID_MAP = {
   "app.phantom": "phantom",
-  "app.backpack": "backpack",
   "com.trustwallet.app": "trust",
   "com.binance.wallet": "binance",
   "com.bitget.web3": "bitget",
@@ -192,7 +191,7 @@ var WC_CHAINS = {
   SOLANA_MAINNET: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"
 };
 var WC_METHODS = {
-  EVM: ["eth_sendTransaction", "personal_sign", "eth_signTypedData"],
+  EVM: ["eth_sendTransaction", "personal_sign", "eth_signTypedData", "wallet_switchEthereumChain"],
   SOLANA: ["solana_signTransaction", "solana_signMessage"]
 };
 var WC_EVENTS = {
@@ -577,6 +576,54 @@ var requestWalletConnect = async (method, params, chainId) => {
   }
 };
 
+// src/lib/walletconnect/transactions.ts
+var toHex = (value) => `0x${value.toString(16)}`;
+var getWcChainId = (chainId) => `eip155:${chainId}`;
+var wcSwitchChain = async (chainId) => {
+  const session = getCurrentSession();
+  if (!session) throw new Error("No WalletConnect session");
+  await requestWalletConnect(
+    "wallet_switchEthereumChain",
+    [{ chainId: toHex(chainId) }],
+    getWcChainId(chainId)
+  );
+};
+var wcSendTransaction = async (params) => {
+  const session = getCurrentSession();
+  if (!session) throw new Error("No WalletConnect session");
+  const txParams = {
+    from: params.from,
+    to: params.to
+  };
+  if (params.value) {
+    txParams.value = params.value;
+  }
+  if (params.data) {
+    txParams.data = params.data;
+  }
+  const hash = await requestWalletConnect(
+    "eth_sendTransaction",
+    [txParams],
+    getWcChainId(params.chainId)
+  );
+  return { hash };
+};
+var getWcEvmAddress = () => {
+  const session = getCurrentSession();
+  if (!session) return null;
+  const account = session.namespaces.eip155?.accounts?.[0];
+  if (!account) return null;
+  return account.split(":")[2];
+};
+var getWcEvmChainId = () => {
+  const session = getCurrentSession();
+  if (!session) return null;
+  const account = session.namespaces.eip155?.accounts?.[0];
+  if (!account) return null;
+  const chainId = account.split(":")[1];
+  return chainId ? parseInt(chainId, 10) : null;
+};
+
 // src/lib/connectors/shared/walletconnect.ts
 var connectViaWalletConnect = async (wcConfig, parseSession, getDeeplink) => {
   let qrUri = null;
@@ -929,11 +976,7 @@ var createBinanceSolanaDappBrowserConnector = () => createDappBrowserSolanaConne
 });
 
 // src/lib/connectors/okx.ts
-var buildOkxBrowseUrl = () => {
-  const dappUrl = window.location.href;
-  const deepLink = `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(dappUrl)}`;
-  return `https://web3.okx.com/download?deeplink=${encodeURIComponent(deepLink)}`;
-};
+var buildOkxBrowseUrl = () => `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(window.location.href)}`;
 var createOkxSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "okx",
   injectedKey: "isOkxWallet",
@@ -1046,6 +1089,7 @@ var EVM_FALLBACK_CONNECTORS = [
   { id: "rainbow", create: createRainbowEvmMobileConnector },
   { id: "exodus", create: createExodusEvmMobileConnector }
 ];
+var sleep = (ms) => new Promise((r) => window.setTimeout(r, ms));
 var cleanupWalletLocalStorage = () => {
   Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
 };
@@ -1060,11 +1104,21 @@ 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 });
+        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();
@@ -1081,6 +1135,60 @@ var getEvmConnectors = () => {
 var watchEvmConnections = (onChange) => {
   return watchConnections(getEvmConfig(), { onChange });
 };
+var switchChain = async (chainId) => {
+  await switchChain$1(getEvmConfig(), { chainId });
+};
+var sendTransaction = async (params) => {
+  const hash = await sendTransaction$1(getEvmConfig(), {
+    to: params.to,
+    value: params.value,
+    data: params.data
+  });
+  return { hash };
+};
+var waitForTransactionReceipt = async (hash) => {
+  const receipt = await waitForTransactionReceipt$1(getEvmConfig(), { hash });
+  return {
+    hash: receipt.transactionHash,
+    status: receipt.status,
+    blockNumber: receipt.blockNumber
+  };
+};
+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/solana/connection.ts
 var currentConnection = {
@@ -1222,8 +1330,8 @@ var getSolanaWallets = () => {
   const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
     return w.constructor.name !== "SolflareMetaMaskWallet";
   }).map(createSolanaConnector);
-  console.log({ wallets });
-  console.log({ connectors });
+  console.log("wallets", { wallets });
+  console.log("connectors", { connectors });
   addFallbackConnectors(connectors, SOLANA_FALLBACK_CONNECTORS);
   return connectors;
 };
@@ -1363,6 +1471,60 @@ var useEvmWallet = (options) => {
     connectedEvmConnector: connectedConnector
   };
 };
+
+// src/lib/context/hooks/useEvmTransactions.ts
+var useEvmTransactions = (hasWcSession) => {
+  const isWc = () => hasWcSession() && getCurrentSession();
+  const switchChain2 = async (chainId) => {
+    if (isWc()) {
+      await wcSwitchChain(chainId);
+    } else {
+      await switchChain(chainId);
+    }
+  };
+  const sendTransaction2 = async (params) => {
+    if (isWc()) {
+      const address = getWcEvmAddress();
+      if (!address) throw new Error("No WalletConnect EVM address");
+      const chainId = getWcEvmChainId();
+      if (!chainId) throw new Error("No WalletConnect chain ID");
+      const result = await wcSendTransaction({
+        from: address,
+        to: params.to,
+        value: params.value !== void 0 ? `0x${params.value.toString(16)}` : void 0,
+        data: params.data,
+        chainId
+      });
+      return { hash: result.hash };
+    }
+    return sendTransaction(params);
+  };
+  const sendAndWait = async (params) => {
+    const { hash } = await sendTransaction2(params);
+    return waitForTransactionReceipt(hash);
+  };
+  const approve2 = async (params) => {
+    if (isWc()) {
+      throw new Error("ERC20 approve via WalletConnect not yet supported");
+    }
+    return approve(params);
+  };
+  const ensureAllowance2 = async (params) => {
+    if (isWc()) {
+      throw new Error("ERC20 ensureAllowance via WalletConnect not yet supported");
+    }
+    return ensureAllowance(params);
+  };
+  return {
+    switchChain: switchChain2,
+    sendTransaction: sendTransaction2,
+    sendAndWait,
+    waitForReceipt: waitForTransactionReceipt,
+    approve: approve2,
+    ensureAllowance: ensureAllowance2,
+    getAllowance
+  };
+};
 var useSolanaWallet = () => {
   const [solanaConnectors, setSolanaConnectors] = createSignal([]);
   const [solanaConnection, setSolanaConnection] = createSignal(null);
@@ -1370,13 +1532,16 @@ var useSolanaWallet = () => {
     null
   );
   onMount(() => {
-    const connectors = getSolanaWallets();
     const wcConnector = createWalletConnectSolanaConnector();
-    if (wcConnector) {
-      connectors.unshift(wcConnector);
-    }
-    setSolanaConnectors(connectors);
-    const unsubscribeWallets = onSolanaWalletsChange(setSolanaConnectors);
+    const getConnectorsWithWc = () => {
+      const connectors = getSolanaWallets();
+      if (wcConnector) connectors.unshift(wcConnector);
+      return connectors;
+    };
+    setSolanaConnectors(getConnectorsWithWc());
+    const unsubscribeWallets = onSolanaWalletsChange(() => {
+      setSolanaConnectors(getConnectorsWithWc());
+    });
     const unsubscribeConnection = watchSolanaConnection((state) => {
       setSolanaConnection(state.connection);
       if (state.connector) {
@@ -1506,6 +1671,7 @@ var WalletProvider = (props) => {
     onEvmConnection: evm.setEvmConnection,
     onSolanaConnection: solana.setSolanaConnection
   });
+  const evmTx = useEvmTransactions(wc.hasWcEvmSession);
   const disconnectEvm = async () => {
     if (evm.connectedEvmConnector()) {
       await evm.disconnectEvm();
@@ -1571,7 +1737,8 @@ var WalletProvider = (props) => {
     disconnectEvm,
     connectSolana: solana.connectSolana,
     disconnectSolana,
-    signMessage
+    signMessage,
+    evmTx
   };
   return createComponent(WalletContext.Provider, {
     value,

package/dist/dev.jsx

@@ -28,7 +28,6 @@ var getEvmConfig = () => {
 import {
   connect,
   disconnect,
-  getConnections,
   getConnectors,
   signMessage as wagmiSignMessage
 } from "@wagmi/core";
@@ -166,7 +165,6 @@ var WALLETS = [
 // src/lib/wallets/mappers.ts
 var EVM_WALLET_ID_MAP = {
   "app.phantom": "phantom",
-  "app.backpack": "backpack",
   "com.trustwallet.app": "trust",
   "com.binance.wallet": "binance",
   "com.bitget.web3": "bitget",
@@ -193,7 +191,7 @@ var WC_CHAINS = {
   SOLANA_MAINNET: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"
 };
 var WC_METHODS = {
-  EVM: ["eth_sendTransaction", "personal_sign", "eth_signTypedData"],
+  EVM: ["eth_sendTransaction", "personal_sign", "eth_signTypedData", "wallet_switchEthereumChain"],
   SOLANA: ["solana_signTransaction", "solana_signMessage"]
 };
 var WC_EVENTS = {
@@ -588,6 +586,54 @@ var requestWalletConnect = async (method, params, chainId) => {
   }
 };
 
+// src/lib/walletconnect/transactions.ts
+var toHex = (value) => `0x${value.toString(16)}`;
+var getWcChainId = (chainId) => `eip155:${chainId}`;
+var wcSwitchChain = async (chainId) => {
+  const session = getCurrentSession();
+  if (!session) throw new Error("No WalletConnect session");
+  await requestWalletConnect(
+    "wallet_switchEthereumChain",
+    [{ chainId: toHex(chainId) }],
+    getWcChainId(chainId)
+  );
+};
+var wcSendTransaction = async (params) => {
+  const session = getCurrentSession();
+  if (!session) throw new Error("No WalletConnect session");
+  const txParams = {
+    from: params.from,
+    to: params.to
+  };
+  if (params.value) {
+    txParams.value = params.value;
+  }
+  if (params.data) {
+    txParams.data = params.data;
+  }
+  const hash = await requestWalletConnect(
+    "eth_sendTransaction",
+    [txParams],
+    getWcChainId(params.chainId)
+  );
+  return { hash };
+};
+var getWcEvmAddress = () => {
+  const session = getCurrentSession();
+  if (!session) return null;
+  const account = session.namespaces.eip155?.accounts?.[0];
+  if (!account) return null;
+  return account.split(":")[2];
+};
+var getWcEvmChainId = () => {
+  const session = getCurrentSession();
+  if (!session) return null;
+  const account = session.namespaces.eip155?.accounts?.[0];
+  if (!account) return null;
+  const chainId = account.split(":")[1];
+  return chainId ? parseInt(chainId, 10) : null;
+};
+
 // src/lib/connectors/shared/walletconnect.ts
 var connectViaWalletConnect = async (wcConfig, parseSession, getDeeplink) => {
   let qrUri = null;
@@ -943,11 +989,7 @@ var createBinanceSolanaDappBrowserConnector = () => createDappBrowserSolanaConne
 });
 
 // src/lib/connectors/okx.ts
-var buildOkxBrowseUrl = () => {
-  const dappUrl = window.location.href;
-  const deepLink = `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(dappUrl)}`;
-  return `https://web3.okx.com/download?deeplink=${encodeURIComponent(deepLink)}`;
-};
+var buildOkxBrowseUrl = () => `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(window.location.href)}`;
 var createOkxSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "okx",
   injectedKey: "isOkxWallet",
@@ -1063,6 +1105,7 @@ var EVM_FALLBACK_CONNECTORS = [
   { id: "rainbow", create: createRainbowEvmMobileConnector },
   { id: "exodus", create: createExodusEvmMobileConnector }
 ];
+var sleep = (ms) => new Promise((r) => window.setTimeout(r, ms));
 var cleanupWalletLocalStorage = () => {
   Object.keys(window.localStorage).filter((key) => key.startsWith("wagmi.")).forEach((key) => window.localStorage.removeItem(key));
 };
@@ -1077,11 +1120,21 @@ 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 });
+        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();
@@ -1102,6 +1155,71 @@ 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/solana/connection.ts
 var currentConnection = {
   connection: null,
@@ -1249,8 +1367,8 @@ var getSolanaWallets = () => {
   const connectors = wallets.filter(isWalletAdapterCompatibleStandardWallet).filter((w) => {
     return w.constructor.name !== "SolflareMetaMaskWallet";
   }).map(createSolanaConnector);
-  console.log({ wallets });
-  console.log({ connectors });
+  console.log("wallets", { wallets });
+  console.log("connectors", { connectors });
   addFallbackConnectors(connectors, SOLANA_FALLBACK_CONNECTORS);
   return connectors;
 };
@@ -1400,6 +1518,60 @@ var useEvmWallet = (options) => {
   };
 };
 
+// src/lib/context/hooks/useEvmTransactions.ts
+var useEvmTransactions = (hasWcSession) => {
+  const isWc = () => hasWcSession() && getCurrentSession();
+  const switchChain2 = async (chainId) => {
+    if (isWc()) {
+      await wcSwitchChain(chainId);
+    } else {
+      await switchChain(chainId);
+    }
+  };
+  const sendTransaction2 = async (params) => {
+    if (isWc()) {
+      const address = getWcEvmAddress();
+      if (!address) throw new Error("No WalletConnect EVM address");
+      const chainId = getWcEvmChainId();
+      if (!chainId) throw new Error("No WalletConnect chain ID");
+      const result = await wcSendTransaction({
+        from: address,
+        to: params.to,
+        value: params.value !== void 0 ? `0x${params.value.toString(16)}` : void 0,
+        data: params.data,
+        chainId
+      });
+      return { hash: result.hash };
+    }
+    return sendTransaction(params);
+  };
+  const sendAndWait = async (params) => {
+    const { hash } = await sendTransaction2(params);
+    return waitForTransactionReceipt(hash);
+  };
+  const approve2 = async (params) => {
+    if (isWc()) {
+      throw new Error("ERC20 approve via WalletConnect not yet supported");
+    }
+    return approve(params);
+  };
+  const ensureAllowance2 = async (params) => {
+    if (isWc()) {
+      throw new Error("ERC20 ensureAllowance via WalletConnect not yet supported");
+    }
+    return ensureAllowance(params);
+  };
+  return {
+    switchChain: switchChain2,
+    sendTransaction: sendTransaction2,
+    sendAndWait,
+    waitForReceipt: waitForTransactionReceipt,
+    approve: approve2,
+    ensureAllowance: ensureAllowance2,
+    getAllowance
+  };
+};
+
 // src/lib/context/hooks/useSolanaWallet.ts
 import { createSignal as createSignal2, onCleanup as onCleanup2, onMount as onMount2 } from "solid-js";
 var useSolanaWallet = () => {
@@ -1409,13 +1581,16 @@ var useSolanaWallet = () => {
     null
   );
   onMount2(() => {
-    const connectors = getSolanaWallets();
     const wcConnector = createWalletConnectSolanaConnector();
-    if (wcConnector) {
-      connectors.unshift(wcConnector);
-    }
-    setSolanaConnectors(connectors);
-    const unsubscribeWallets = onSolanaWalletsChange(setSolanaConnectors);
+    const getConnectorsWithWc = () => {
+      const connectors = getSolanaWallets();
+      if (wcConnector) connectors.unshift(wcConnector);
+      return connectors;
+    };
+    setSolanaConnectors(getConnectorsWithWc());
+    const unsubscribeWallets = onSolanaWalletsChange(() => {
+      setSolanaConnectors(getConnectorsWithWc());
+    });
     const unsubscribeConnection = watchSolanaConnection((state) => {
       setSolanaConnection(state.connection);
       if (state.connector) {
@@ -1547,6 +1722,7 @@ var WalletProvider = (props) => {
     onEvmConnection: evm.setEvmConnection,
     onSolanaConnection: solana.setSolanaConnection
   });
+  const evmTx = useEvmTransactions(wc.hasWcEvmSession);
   const disconnectEvm = async () => {
     if (evm.connectedEvmConnector()) {
       await evm.disconnectEvm();
@@ -1612,7 +1788,8 @@ var WalletProvider = (props) => {
     disconnectEvm,
     connectSolana: solana.connectSolana,
     disconnectSolana,
-    signMessage
+    signMessage,
+    evmTx
   };
   return <WalletContext.Provider value={value}>{props.children}</WalletContext.Provider>;
 };