@tomo-inc/wallet-adaptor-base 0.0.20 → 0.0.22

package/dist/index.cjs

@@ -76,15 +76,9 @@ function uint8arrayToHex(uint8array) {
 
 // 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;
   }
@@ -284,7 +278,7 @@ function tomoConnectorDector(wallet) {
       rdns: wallet == null ? void 0 : wallet.rdns,
       deeplink: wallet == null ? void 0 : wallet.deeplink,
       mobile: wallet == null ? void 0 : wallet.mobile,
-      links: {
+      links: (wallet == null ? void 0 : wallet.links) || {
         homepage: ((_d = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _d.qrCode) || "",
         ios_install: ((_e = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _e.ios) || "",
         android_install: ((_f = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _f.android) || "",
@@ -354,7 +348,7 @@ async function eip6963Wallets() {
     function handleProviderAnnouncement(event) {
       try {
         const { info: wallet, provider } = event.detail;
-        const isInfoValid = typeof (wallet == null ? void 0 : wallet.uuid) === "string" && typeof (wallet == null ? void 0 : wallet.name) === "string" && typeof (wallet == null ? void 0 : wallet.icon) === "string" && typeof (wallet == null ? void 0 : wallet.rdns) === "string";
+        const isInfoValid = typeof (wallet == null ? void 0 : wallet.uuid) === "string" && typeof (wallet == null ? void 0 : wallet.name) === "string" && typeof (wallet == null ? void 0 : wallet.icon) === "string" && ((wallet == null ? void 0 : wallet.rdns) === void 0 || typeof (wallet == null ? void 0 : wallet.rdns) === "string");
         if (wallet && provider && isInfoValid && typeof provider.request === "function") {
           const existingWallet = evmWallets.find((w) => w.info.uuid === wallet.uuid);
           if (!existingWallet) {
@@ -690,12 +684,12 @@ var WalletConnectProvider = class {
       }
       return this.connect();
     }
-    if (!this.session) {
-      throw new Error("Not connected. Please call connect() first.");
-    }
     if (args.method === "eth_chainId") {
       return this.chainId || "0x1";
     }
+    if (!this.session) {
+      throw new Error("Not connected. Please call connect() first.");
+    }
     try {
       const result = await this.client.sendRequest({
         topic: this.session.topic,
@@ -966,7 +960,7 @@ var WalletConnectSolanaProvider = class {
   async request(args) {
     if (args.method === "solana_requestAccounts") {
       if (this.accounts.length > 0) {
-        return { publicKey: this.accounts[0] };
+        return this.accounts[0];
       }
       const accounts = await this.connect();
       return accounts;
@@ -1322,6 +1316,7 @@ var connect = async (connectParams, walletOptions) => {
       address = ((_e = (_d = res == null ? void 0 : res.accounts) == null ? void 0 : _d[0]) == null ? void 0 : _e.address) || "";
     }
     network = "mainnet-beta";
+    chainId = `solana:${network}`;
   }
   if (chainType === "aptos") {
     if (provider == null ? void 0 : provider.connect) {
@@ -1401,7 +1396,7 @@ var connectMobile = async ({
   connectParams,
   walletOptions
 }) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const { useWalletConnect, dappLink } = connectParams;
   const { mobile, links } = walletOptions.walletInfo;
   const connectWithWalletConnect = () => {
@@ -1433,8 +1428,8 @@ var connectMobile = async ({
   };
   if (useWalletConnect) {
     return connectWithWalletConnect();
-  } else if (mobile == null ? void 0 : mobile.getDeeplink) {
-    const deeplink = await ((_a = mobile == null ? void 0 : mobile.getDeeplink) == null ? void 0 : _a.call(mobile, dappLink));
+  } else if ((_a = mobile == null ? void 0 : mobile.deeplinkTemplate) == null ? void 0 : _a.deeplink) {
+    const deeplink = (_b = mobile == null ? void 0 : mobile.deeplinkTemplate) == null ? void 0 : _b.deeplink.replace("{dappUrl}", encodeURIComponent(dappLink));
     if (deeplink) {
       openUri(deeplink);
     }
@@ -1448,9 +1443,9 @@ var connectMobile = async ({
     } else {
       openUri(links.homepage || "");
     }
-    throw new Error(`${(_b = walletOptions.walletInfo) == null ? void 0 : _b.name} not supported`);
-  } else {
     throw new Error(`${(_c = walletOptions.walletInfo) == null ? void 0 : _c.name} not supported`);
+  } else {
+    throw new Error(`${(_d = walletOptions.walletInfo) == null ? void 0 : _d.name} not supported`);
   }
   return new Promise(() => {
   });
@@ -1675,18 +1670,19 @@ Resources:`;
 var getAllTypeChainIds = ({ chainId, chainType }) => {
   if (viem.isHex(chainId)) {
     const chainIdHex2 = chainId;
-    chainId = viem.fromHex(chainId, "number").toString();
+    const chainIdStr2 = viem.fromHex(chainId, "number").toString();
     return {
-      chainId,
+      chainId: chainIdStr2,
       chainIdHex: chainIdHex2,
-      chainUid: `${chainType}:${chainId}`
+      chainUid: `${chainType}:${chainIdStr2}`
     };
   }
+  const chainIdStr = String(chainId);
   const chainIdHex = viem.toHex(Number(chainId));
   return {
-    chainId,
+    chainId: chainIdStr,
     chainIdHex,
-    chainUid: `${chainType}:${chainId}`
+    chainUid: `${chainType}:${chainIdStr}`
   };
 };
 

package/dist/index.d.cts

@@ -16,6 +16,9 @@ interface WalletInfo {
     mobile?: {
         getUri?: (uri: string) => string;
         getDeeplink?: (dappUrl?: string, chainId?: number) => string | Promise<string>;
+        deeplinkTemplate?: {
+            deeplink?: string;
+        };
     };
     links: {
         homepage?: string;
@@ -41,6 +44,7 @@ interface ConnectorProvider {
 }
 type ConnectorProviders = Partial<Record<ChainTypeEnum, ConnectorProvider | null>>;
 interface Connector {
+    providers?: any;
     info: WalletInfo;
     isInstalled?: boolean;
     recommoned?: boolean;

package/dist/index.d.ts

@@ -16,6 +16,9 @@ interface WalletInfo {
     mobile?: {
         getUri?: (uri: string) => string;
         getDeeplink?: (dappUrl?: string, chainId?: number) => string | Promise<string>;
+        deeplinkTemplate?: {
+            deeplink?: string;
+        };
     };
     links: {
         homepage?: string;
@@ -41,6 +44,7 @@ interface ConnectorProvider {
 }
 type ConnectorProviders = Partial<Record<ChainTypeEnum, ConnectorProvider | null>>;
 interface Connector {
+    providers?: any;
     info: WalletInfo;
     isInstalled?: boolean;
     recommoned?: boolean;

package/dist/index.js

@@ -74,15 +74,9 @@ function uint8arrayToHex(uint8array) {
 
 // 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;
   }
@@ -282,7 +276,7 @@ function tomoConnectorDector(wallet) {
       rdns: wallet == null ? void 0 : wallet.rdns,
       deeplink: wallet == null ? void 0 : wallet.deeplink,
       mobile: wallet == null ? void 0 : wallet.mobile,
-      links: {
+      links: (wallet == null ? void 0 : wallet.links) || {
         homepage: ((_d = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _d.qrCode) || "",
         ios_install: ((_e = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _e.ios) || "",
         android_install: ((_f = wallet == null ? void 0 : wallet.downloadUrls) == null ? void 0 : _f.android) || "",
@@ -352,7 +346,7 @@ async function eip6963Wallets() {
     function handleProviderAnnouncement(event) {
       try {
         const { info: wallet, provider } = event.detail;
-        const isInfoValid = typeof (wallet == null ? void 0 : wallet.uuid) === "string" && typeof (wallet == null ? void 0 : wallet.name) === "string" && typeof (wallet == null ? void 0 : wallet.icon) === "string" && typeof (wallet == null ? void 0 : wallet.rdns) === "string";
+        const isInfoValid = typeof (wallet == null ? void 0 : wallet.uuid) === "string" && typeof (wallet == null ? void 0 : wallet.name) === "string" && typeof (wallet == null ? void 0 : wallet.icon) === "string" && ((wallet == null ? void 0 : wallet.rdns) === void 0 || typeof (wallet == null ? void 0 : wallet.rdns) === "string");
         if (wallet && provider && isInfoValid && typeof provider.request === "function") {
           const existingWallet = evmWallets.find((w) => w.info.uuid === wallet.uuid);
           if (!existingWallet) {
@@ -688,12 +682,12 @@ var WalletConnectProvider = class {
       }
       return this.connect();
     }
-    if (!this.session) {
-      throw new Error("Not connected. Please call connect() first.");
-    }
     if (args.method === "eth_chainId") {
       return this.chainId || "0x1";
     }
+    if (!this.session) {
+      throw new Error("Not connected. Please call connect() first.");
+    }
     try {
       const result = await this.client.sendRequest({
         topic: this.session.topic,
@@ -964,7 +958,7 @@ var WalletConnectSolanaProvider = class {
   async request(args) {
     if (args.method === "solana_requestAccounts") {
       if (this.accounts.length > 0) {
-        return { publicKey: this.accounts[0] };
+        return this.accounts[0];
       }
       const accounts = await this.connect();
       return accounts;
@@ -1320,6 +1314,7 @@ var connect = async (connectParams, walletOptions) => {
       address = ((_e = (_d = res == null ? void 0 : res.accounts) == null ? void 0 : _d[0]) == null ? void 0 : _e.address) || "";
     }
     network = "mainnet-beta";
+    chainId = `solana:${network}`;
   }
   if (chainType === "aptos") {
     if (provider == null ? void 0 : provider.connect) {
@@ -1399,7 +1394,7 @@ var connectMobile = async ({
   connectParams,
   walletOptions
 }) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const { useWalletConnect, dappLink } = connectParams;
   const { mobile, links } = walletOptions.walletInfo;
   const connectWithWalletConnect = () => {
@@ -1431,8 +1426,8 @@ var connectMobile = async ({
   };
   if (useWalletConnect) {
     return connectWithWalletConnect();
-  } else if (mobile == null ? void 0 : mobile.getDeeplink) {
-    const deeplink = await ((_a = mobile == null ? void 0 : mobile.getDeeplink) == null ? void 0 : _a.call(mobile, dappLink));
+  } else if ((_a = mobile == null ? void 0 : mobile.deeplinkTemplate) == null ? void 0 : _a.deeplink) {
+    const deeplink = (_b = mobile == null ? void 0 : mobile.deeplinkTemplate) == null ? void 0 : _b.deeplink.replace("{dappUrl}", encodeURIComponent(dappLink));
     if (deeplink) {
       openUri(deeplink);
     }
@@ -1446,9 +1441,9 @@ var connectMobile = async ({
     } else {
       openUri(links.homepage || "");
     }
-    throw new Error(`${(_b = walletOptions.walletInfo) == null ? void 0 : _b.name} not supported`);
-  } else {
     throw new Error(`${(_c = walletOptions.walletInfo) == null ? void 0 : _c.name} not supported`);
+  } else {
+    throw new Error(`${(_d = walletOptions.walletInfo) == null ? void 0 : _d.name} not supported`);
   }
   return new Promise(() => {
   });
@@ -1673,18 +1668,19 @@ Resources:`;
 var getAllTypeChainIds = ({ chainId, chainType }) => {
   if (isHex(chainId)) {
     const chainIdHex2 = chainId;
-    chainId = fromHex(chainId, "number").toString();
+    const chainIdStr2 = fromHex(chainId, "number").toString();
     return {
-      chainId,
+      chainId: chainIdStr2,
       chainIdHex: chainIdHex2,
-      chainUid: `${chainType}:${chainId}`
+      chainUid: `${chainType}:${chainIdStr2}`
     };
   }
+  const chainIdStr = String(chainId);
   const chainIdHex = toHex(Number(chainId));
   return {
-    chainId,
+    chainId: chainIdStr,
     chainIdHex,
-    chainUid: `${chainType}:${chainId}`
+    chainUid: `${chainType}:${chainIdStr}`
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomo-inc/wallet-adaptor-base",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "author": "tomo.inc",
   "license": "MIT",
   "private": false,
@@ -22,13 +22,18 @@
     "@solana/web3.js": "^1.98.0",
     "@wallet-standard/core": "^1.1.0",
     "viem": "2.21.54",
-    "@tomo-inc/wallet-utils": "0.0.18",
+    "@tomo-inc/wallet-utils": "0.0.20",
     "@tomo-inc/wallet-connect-protocol": "0.0.17"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "tsup": "^8.0.0",
     "typescript": "^5.0.0",
+    "@vitest/coverage-v8": "^3.2.4",
     "vitest": "^3.2.4"
+  },
+  "scripts": {
+    "build": "tsup",
+    "test": "vitest run"
   }
 }

package/project.json

@@ -50,7 +50,7 @@
       "executor": "nx:run-commands",
       "outputs": ["{projectRoot}/coverage"],
       "options": {
-        "command": "vitest run",
+        "command": "vitest run --coverage",
         "cwd": "packages/wallet-adaptor-base"
       }
     },