@tomo-inc/wallet-adaptor-base 0.0.17 → 0.0.18

package/dist/index.js

@@ -1,3 +1,4 @@
+import { mainnet } from 'viem/chains';
 import { getWallets } from '@wallet-standard/core';
 import { WalletConnectClient } from '@tomo-inc/wallet-connect-protocol';
 import { toHex, isHex, fromHex } from 'viem';
@@ -70,6 +71,50 @@ function uint8arrayToHex(uint8array) {
   return Array.from(uint8array, (byte) => byte.toString(16).padStart(2, "0")).join("");
 }
 
+// src/utils/wallet-config.ts
+function hasWalletConfigProperties(config) {
+  if (!config || typeof config !== "object") {
+    return false;
+  }
+  return typeof config.id === "string" && typeof config.name === "string" && typeof config.icon === "string" && typeof config.iconBackground === "string";
+}
+function hasWagmiConnectorProperties(config) {
+  if (!config || typeof config !== "object") {
+    return false;
+  }
+  if (typeof config.createConnector === "function") {
+    return true;
+  }
+  const hasConnectorMethods = typeof config.connect === "function" || typeof config.disconnect === "function" || typeof config.getAccounts === "function" || typeof config.getChainId === "function";
+  const hasConnectorId = typeof config.id === "string" || typeof config.name === "string";
+  return hasConnectorMethods && hasConnectorId;
+}
+function isWagmiConnector(config) {
+  if (typeof config === "function") {
+    return true;
+  }
+  if (config && typeof config === "object") {
+    const hasWalletConfigProps = hasWalletConfigProperties(config);
+    if (!hasWalletConfigProps) {
+      return hasWagmiConnectorProperties(config);
+    }
+  }
+  return false;
+}
+
+// src/wallets/index.ts
+var walletBaseUrl = "https://web3-assets.tomo.inc";
+var allWallets = [];
+var getAllWallets = async (baseUrl) => {
+  if (allWallets.length > 0) {
+    return allWallets;
+  }
+  const walletListResponse = await fetch((baseUrl || walletBaseUrl) + "/api/wallets");
+  const walletListData = await walletListResponse.json();
+  const walletList = allWallets = walletListData == null ? void 0 : walletListData.data;
+  return walletList;
+};
+
 // src/type.ts
 var ProviderProtocol = /* @__PURE__ */ ((ProviderProtocol2) => {
   ProviderProtocol2["EIP6963"] = "eip6963";
@@ -131,17 +176,67 @@ var supportedWalletConfigTypes = {
   tomo: true,
   wagmi: true
 };
-function walletConfigAdapter(walletConfig, connectorType) {
+function findWalletInDefaultConnectors(id, name, defaultWallets) {
+  let found = defaultWallets.find(
+    (wallet) => {
+      var _a, _b;
+      return ((_a = wallet.id) == null ? void 0 : _a.toLowerCase()) === id.toLowerCase() || ((_b = wallet.id) == null ? void 0 : _b.toLowerCase()) === id.toLowerCase().replace(/\s+/g, "-");
+    }
+  );
+  if (!found) {
+    const normalizedName = name.toLowerCase();
+    found = defaultWallets.find((wallet) => {
+      const walletName = wallet.name.toLowerCase();
+      return walletName === normalizedName || walletName.includes(normalizedName) || normalizedName.includes(walletName) || // support common wallet name variations matching
+      normalizedName.includes("metamask") && walletName.includes("metamask") || normalizedName.includes("coinbase") && walletName.includes("coinbase") || normalizedName.includes("safe") && walletName.includes("safe") || normalizedName.includes("walletconnect") && walletName.includes("walletconnect") || normalizedName.includes("injected") && walletName.includes("injected");
+    });
+  }
+  return found || null;
+}
+function adaptWagmiConnectorToWalletConfig(wagmiConnector, allWallets2, baseUrl) {
+  var _a, _b, _c, _d;
+  const tempConfig = { chains: [mainnet] };
+  const connector = wagmiConnector(tempConfig);
+  const id = connector.id || "unknown";
+  const name = connector.name || "Unknown Wallet";
+  const defaultWallet = findWalletInDefaultConnectors(id, name, allWallets2);
+  const walletConfig = {
+    id,
+    name,
+    namespace: (defaultWallet == null ? void 0 : defaultWallet.namespace) || "eip155",
+    // default EVM namespace
+    icon: baseUrl + (defaultWallet == null ? void 0 : defaultWallet.icon) || "",
+    iconBackground: (defaultWallet == null ? void 0 : defaultWallet.iconBackground) || "#666666",
+    rdns: defaultWallet == null ? void 0 : defaultWallet.rdns,
+    downloadUrls: (defaultWallet == null ? void 0 : defaultWallet.downloadUrls) || {},
+    installed: (defaultWallet == null ? void 0 : defaultWallet.installed) || false,
+    flag: (defaultWallet == null ? void 0 : defaultWallet.flag) || "",
+    solana: {
+      namespace: ((_a = defaultWallet == null ? void 0 : defaultWallet.solana) == null ? void 0 : _a.namespace) || "",
+      flag: ((_b = defaultWallet == null ? void 0 : defaultWallet.solana) == null ? void 0 : _b.flag) || ""
+    },
+    aptos: {
+      namespace: ((_c = defaultWallet == null ? void 0 : defaultWallet.aptos) == null ? void 0 : _c.namespace) || "",
+      flag: ((_d = defaultWallet == null ? void 0 : defaultWallet.aptos) == null ? void 0 : _d.flag) || ""
+    },
+    createConnector: wagmiConnector
+  };
+  return walletConfig;
+}
+function walletConfigAdapter(walletConfig, connectorType, allWallets2, baseUrl) {
   switch (connectorType) {
     case "tomo":
       return walletConfig;
     case "wagmi":
-      return null;
+      if (typeof walletConfig === "function") {
+        return adaptWagmiConnectorToWalletConfig(walletConfig, allWallets2, baseUrl);
+      }
+      return walletConfig;
     default:
       return walletConfig;
   }
 }
-function connectorDector(wallet) {
+function tomoConnectorDector(wallet) {
   var _a, _b, _c, _d, _e, _f, _g;
   const evmNS = {
     namespace: (wallet == null ? void 0 : wallet.namespace) || "",
@@ -218,19 +313,54 @@ function connectorDector(wallet) {
     providers
   };
 }
+function wagmiConnectorDector(wallet) {
+  var _a, _b, _c, _d;
+  const tempConfig = {};
+  const connector = wallet.createConnector(tempConfig);
+  const evmNS = {
+    namespace: (wallet == null ? void 0 : wallet.namespace) || "",
+    flag: (wallet == null ? void 0 : wallet.flag) || ""
+  };
+  const isEvm = hasInjectedProvider(evmNS);
+  isEvm || wallet.installed || false;
+  const providers = {
+    evm: {
+      provider: connector,
+      protocol: "eip6963" /* EIP6963 */
+    }
+  };
+  return {
+    info: {
+      uuid: wallet == null ? void 0 : wallet.id,
+      name: wallet == null ? void 0 : wallet.name,
+      icon: wallet == null ? void 0 : wallet.icon,
+      iconBackground: wallet == null ? void 0 : wallet.iconBackground,
+      rdns: wallet == null ? void 0 : wallet.rdns,
+      links: {
+        homepage: ((_a = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _a.qrCode) || "",
+        ios_install: ((_b = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _b.ios) || "",
+        android_install: ((_c = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _c.android) || "",
+        chrome_install: ((_d = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _d.chrome) || ""
+      }
+    },
+    isInstalled: true,
+    providers
+  };
+}
+function connectorDector(wallet, connectorType) {
+  if (connectorType === "wagmi") {
+    return wagmiConnectorDector(wallet);
+  }
+  return tomoConnectorDector(wallet);
+}
 
 // src/wallets/defaultConnectors.ts
-var defaultWallets = [];
 var getDefaultConnectors = async (baseUrl) => {
-  if (defaultWallets.length > 0) {
-    return defaultWallets.map((wallet) => connectorDector(wallet));
-  }
-  const walletListResponse = await fetch((baseUrl || "https://web3-assets.tomo.inc") + "/api/wallets");
-  const walletList = await walletListResponse.json();
-  defaultWallets = walletList == null ? void 0 : walletList.data.map((wallet) => __spreadProps(__spreadValues({}, wallet), {
-    icon: (baseUrl || "https://web3-assets.tomo.inc") + wallet.icon
+  const walletList = await getAllWallets(baseUrl);
+  const defaultWallets = walletList == null ? void 0 : walletList.map((wallet) => __spreadProps(__spreadValues({}, wallet), {
+    icon: (baseUrl || walletBaseUrl) + wallet.icon
   }));
-  return defaultWallets == null ? void 0 : defaultWallets.map((wallet) => connectorDector(wallet));
+  return defaultWallets == null ? void 0 : defaultWallets.map((wallet) => connectorDector(wallet, "tomo"));
 };
 
 // src/wallets/wallet-eip6963.ts
@@ -1004,9 +1134,7 @@ async function walletConnectWallets(baseUrl) {
   if (wcWallets.length > 0) {
     return wcWallets.map((wallet) => convertWalletToConnector(wallet));
   }
-  const walletListResponse = await fetch(
-    (baseUrl || "https://web3-assets.tomo.inc") + "/api/wallets?walletId=walletConnect"
-  );
+  const walletListResponse = await fetch((baseUrl || walletBaseUrl) + "/api/wallets?walletId=walletConnect");
   const walletList = await walletListResponse.json();
   if (((_a = walletList == null ? void 0 : walletList.data) == null ? void 0 : _a.length) === 0) {
     return [];
@@ -1180,9 +1308,16 @@ var connect = async (connectParams, walletOptions) => {
   let address = "";
   let network = "";
   if (chainType === "evm") {
-    const res = await provider.request({ method: "eth_requestAccounts" });
-    address = (res == null ? void 0 : res[0]) || "";
-    chainId = await provider.request({ method: "eth_chainId" });
+    if (provider == null ? void 0 : provider.request) {
+      const res = await provider.request({ method: "eth_requestAccounts" });
+      address = (res == null ? void 0 : res[0]) || "";
+      chainId = await provider.request({ method: "eth_chainId" });
+    } else {
+      const wagmiProvider = await provider.getProvider();
+      const res = await wagmiProvider.request({ method: "eth_requestAccounts" });
+      address = (res == null ? void 0 : res[0]) || "";
+      chainId = await provider.request({ method: "eth_chainId" });
+    }
   }
   if (chainType === "solana") {
     let res = null;
@@ -1692,42 +1827,40 @@ var getBalance = async (token, walletOptions) => {
   throw new Error(`getBalance not supported in ${chainType}`);
 };
 
-// src/wallets/index.ts
-var getAllWallets = async (baseUrl) => {
-  const walletListResponse = await fetch((baseUrl || "https://web3-assets.tomo.inc") + "/api/wallets");
-  const walletList = await walletListResponse.json();
-  return walletList;
-};
-
 // src/index.ts
-var walletBaseUrl = "https://embedded-wallet.tomo.inc";
 async function loadConnectors({
   chainType = "all",
-  recommonedConnectors,
+  recommendedConnectors,
   connectorTypes = [],
   options = {
     baseUrl: walletBaseUrl
   }
 }) {
-  const recommonedWalletConfigs = recommonedConnectors || [];
+  const recommonedWalletConfigs = recommendedConnectors || [];
   const evmWallets = await eip6963Wallets();
   const { solanaWallets, aptosWallets } = await walletStandardWallets();
   const wcWallets2 = await walletConnectWallets(options.baseUrl);
-  let recommonedConnectorsDetected = [];
+  const allWallets2 = await getAllWallets(options.baseUrl);
+  let recommendedConnectorsDetected = [];
   if (recommonedWalletConfigs.length > 0) {
-    recommonedConnectorsDetected = recommonedWalletConfigs.map((walletConfig, index) => {
+    recommendedConnectorsDetected = recommonedWalletConfigs.map((walletConfig, index) => {
       const connectorType = connectorTypes[index];
       if (!supportedWalletConfigTypes[connectorType]) {
         throw new Error(`Unsupported wallet config type: ${connectorType}`);
       }
-      const _walletConfig = walletConfigAdapter(walletConfig, connectorType);
-      return __spreadProps(__spreadValues({}, connectorDector(_walletConfig)), {
+      const _walletConfig = walletConfigAdapter(
+        walletConfig,
+        connectorType,
+        allWallets2,
+        options.baseUrl || walletBaseUrl
+      );
+      return __spreadProps(__spreadValues({}, connectorDector(_walletConfig, connectorType)), {
         recommoned: true
       });
     });
   }
   const defaultConnectors = await getDefaultConnectors(options.baseUrl);
-  const connectorsFromConfig = uniqueConnectors([...recommonedConnectorsDetected, ...defaultConnectors]);
+  const connectorsFromConfig = uniqueConnectors([...recommendedConnectorsDetected, ...defaultConnectors]);
   const connectorsDetecteds = [...evmWallets, ...solanaWallets, ...aptosWallets, ...wcWallets2];
   for (const connector of connectorsDetecteds) {
     const _connector = connectorsFromConfig.find((c) => c.info.name === connector.info.name);
@@ -1747,8 +1880,8 @@ async function loadConnectors({
   });
   return {
     all: allConnectors,
-    recommoned: recommonedConnectorsDetected
+    recommoned: recommendedConnectorsDetected
   };
 }
 
-export { ProviderChainType, ProviderProtocol, SupportedChainTypes, addChain, connect, connectMobile, disconnect, getAllWallets, getBalance, isMobile, loadConnectors, setWalletConnectConfig, signInWithWallet, signMessage, switchChain };
+export { ProviderChainType, ProviderProtocol, SupportedChainTypes, addChain, connect, connectMobile, disconnect, getAllWallets, getBalance, isMobile, isWagmiConnector, loadConnectors, setWalletConnectConfig, signInWithWallet, signMessage, switchChain, walletBaseUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomo-inc/wallet-adaptor-base",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "author": "tomo.inc",
   "license": "MIT",
   "private": false,
@@ -22,7 +22,7 @@
     "@solana/web3.js": "^1.98.0",
     "@wallet-standard/core": "^1.1.0",
     "viem": "2.21.54",
-    "@tomo-inc/wallet-connect-protocol": "0.0.16"
+    "@tomo-inc/wallet-connect-protocol": "0.0.17"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/src/__tests__/defaultConnectors.test.ts

@@ -0,0 +1,110 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+
+describe("defaultConnectors", () => {
+  let originalFetch: typeof fetch;
+  let mockConnectorDector: ReturnType<typeof vi.fn>;
+
+  beforeEach(async () => {
+    originalFetch = global.fetch;
+    // Reset module cache before each test
+    vi.resetModules();
+
+    // Re-import after reset
+    const detectorModule = await import("../wallets/detector");
+    mockConnectorDector = vi.fn((wallet: any) => ({
+      info: { name: wallet.name, uuid: wallet.id },
+      providers: {},
+    }));
+    vi.spyOn(detectorModule, "connectorDector").mockImplementation(mockConnectorDector);
+  });
+
+  afterEach(() => {
+    global.fetch = originalFetch;
+    vi.restoreAllMocks();
+  });
+
+  describe("getDefaultConnectors", () => {
+    it("should fetch and return default connectors", async () => {
+      const { getDefaultConnectors } = await import("../wallets/defaultConnectors");
+      const mockWallets = [
+        { id: "wallet1", name: "Wallet 1", icon: "/icon1.png" },
+        { id: "wallet2", name: "Wallet 2", icon: "/icon2.png" },
+      ];
+
+      global.fetch = vi.fn().mockResolvedValue({
+        json: vi.fn().mockResolvedValue({ data: mockWallets }),
+      });
+
+      const result = await getDefaultConnectors();
+
+      expect(global.fetch).toHaveBeenCalledWith("https://web3-assets.tomo.inc/api/wallets");
+      expect(result).toHaveLength(2);
+      expect(mockConnectorDector).toHaveBeenCalledTimes(2);
+    });
+
+    it("should use custom baseUrl", async () => {
+      const { getDefaultConnectors } = await import("../wallets/defaultConnectors");
+      const mockWallets = [{ id: "wallet1", name: "Wallet 1", icon: "/icon1.png" }];
+
+      global.fetch = vi.fn().mockResolvedValue({
+        json: vi.fn().mockResolvedValue({ data: mockWallets }),
+      });
+
+      const customBaseUrl = "https://custom-api.example.com";
+      await getDefaultConnectors(customBaseUrl);
+
+      expect(global.fetch).toHaveBeenCalledWith(`${customBaseUrl}/api/wallets`);
+    });
+
+    it("should prepend baseUrl to icon paths", async () => {
+      const { getDefaultConnectors } = await import("../wallets/defaultConnectors");
+      const mockWallets = [{ id: "wallet1", name: "Wallet 1", icon: "/icon1.png" }];
+
+      global.fetch = vi.fn().mockResolvedValue({
+        json: vi.fn().mockResolvedValue({ data: mockWallets }),
+      });
+
+      const customBaseUrl = "https://custom-api.example.com";
+      await getDefaultConnectors(customBaseUrl);
+
+      expect(mockConnectorDector).toHaveBeenCalledWith({
+        id: "wallet1",
+        name: "Wallet 1",
+        icon: "https://custom-api.example.com/icon1.png",
+      });
+    });
+
+    it("should return cached connectors on second call", async () => {
+      const { getDefaultConnectors } = await import("../wallets/defaultConnectors");
+      const mockWallets = [{ id: "wallet1", name: "Wallet 1", icon: "/icon1.png" }];
+
+      global.fetch = vi.fn().mockResolvedValue({
+        json: vi.fn().mockResolvedValue({ data: mockWallets }),
+      });
+
+      const result1 = await getDefaultConnectors();
+      const result2 = await getDefaultConnectors();
+
+      expect(global.fetch).toHaveBeenCalledTimes(1);
+      expect(result1).toEqual(result2);
+    });
+
+    it("should handle empty wallet list", async () => {
+      const { getDefaultConnectors } = await import("../wallets/defaultConnectors");
+      global.fetch = vi.fn().mockResolvedValue({
+        json: vi.fn().mockResolvedValue({ data: [] }),
+      });
+
+      const result = await getDefaultConnectors();
+
+      expect(result).toHaveLength(0);
+    });
+
+    it("should handle fetch errors gracefully", async () => {
+      const { getDefaultConnectors } = await import("../wallets/defaultConnectors");
+      global.fetch = vi.fn().mockRejectedValue(new Error("Network error"));
+
+      await expect(getDefaultConnectors()).rejects.toThrow("Network error");
+    });
+  });
+});