@bit-buccaneers/wallet-abstraction 0.0.15 → 0.0.17

package/dist/dev.js

@@ -799,6 +799,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,
@@ -885,13 +886,19 @@ var createBinanceSolanaDappBrowserConnector = () => createDappBrowserSolanaConne
 });
 
 // src/lib/connectors/okx.ts
+var OKX_CONFIG = {
+  walletId: "okx",
+  wcDeeplink: "okx://wallet/wc",
+  injectedKey: "isOkxWallet"
+};
 var buildOkxBrowseUrl = () => `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(window.location.href)}`;
+var createOkxEvmConnector = () => createWcEvmConnector(OKX_CONFIG);
+var createOkxSolanaConnector = () => createWcSolanaConnector(OKX_CONFIG);
 var createOkxSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "okx",
   injectedKey: "isOkxWallet",
   buildUrl: buildOkxBrowseUrl
 });
-var createOkxSolanaConnector = () => createDownloadOnlySolanaConnector({ walletId: "okx" });
 
 // src/lib/connectors/coinbase.ts
 var buildCoinbaseBrowseUrl = () => `cbwallet://dapp?url=${encodeURIComponent(window.location.href)}`;
@@ -921,7 +928,6 @@ var disconnectWc2 = async () => {
   }
 };
 var createWalletConnectEvmConnector = () => {
-  if (isMobile()) return null;
   return {
     id: walletConfig.id,
     name: walletConfig.name,
@@ -955,7 +961,6 @@ var createWalletConnectEvmConnector = () => {
   };
 };
 var createWalletConnectSolanaConnector = () => {
-  if (isMobile()) return null;
   return {
     id: walletConfig.id,
     name: walletConfig.name,
@@ -999,18 +1004,22 @@ var EVM_FALLBACK_CONNECTORS = [
   ...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];
+  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":
-      return providers.some((p) => p.isCoinbaseWallet);
+      if ("coinbaseWalletExtension" in window) return true;
+      return providers.some(
+        (p) => p.isCoinbaseWallet || p.isCoinbaseBrowser
+      );
     default:
       return true;
   }
@@ -1229,6 +1238,10 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createBinanceSolanaDappBrowserConnector())
   }
 ] : [
+  {
+    id: "metamask",
+    create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector())
+  },
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
   {
     id: "solflare",

package/dist/dev.jsx

@@ -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,
@@ -893,13 +894,19 @@ var createBinanceSolanaDappBrowserConnector = () => createDappBrowserSolanaConne
 });
 
 // src/lib/connectors/okx.ts
+var OKX_CONFIG = {
+  walletId: "okx",
+  wcDeeplink: "okx://wallet/wc",
+  injectedKey: "isOkxWallet"
+};
 var buildOkxBrowseUrl = () => `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(window.location.href)}`;
+var createOkxEvmConnector = () => createWcEvmConnector(OKX_CONFIG);
+var createOkxSolanaConnector = () => createWcSolanaConnector(OKX_CONFIG);
 var createOkxSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "okx",
   injectedKey: "isOkxWallet",
   buildUrl: buildOkxBrowseUrl
 });
-var createOkxSolanaConnector = () => createDownloadOnlySolanaConnector({ walletId: "okx" });
 
 // src/lib/connectors/coinbase.ts
 var buildCoinbaseBrowseUrl = () => `cbwallet://dapp?url=${encodeURIComponent(window.location.href)}`;
@@ -932,7 +939,6 @@ var disconnectWc2 = async () => {
   }
 };
 var createWalletConnectEvmConnector = () => {
-  if (isMobile()) return null;
   return {
     id: walletConfig.id,
     name: walletConfig.name,
@@ -966,7 +972,6 @@ var createWalletConnectEvmConnector = () => {
   };
 };
 var createWalletConnectSolanaConnector = () => {
-  if (isMobile()) return null;
   return {
     id: walletConfig.id,
     name: walletConfig.name,
@@ -1010,18 +1015,22 @@ var EVM_FALLBACK_CONNECTORS = [
   ...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];
+  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":
-      return providers.some((p) => p.isCoinbaseWallet);
+      if ("coinbaseWalletExtension" in window) return true;
+      return providers.some(
+        (p) => p.isCoinbaseWallet || p.isCoinbaseBrowser
+      );
     default:
       return true;
   }
@@ -1261,6 +1270,10 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createBinanceSolanaDappBrowserConnector())
   }
 ] : [
+  {
+    id: "metamask",
+    create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector())
+  },
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
   {
     id: "solflare",

package/dist/index.js

@@ -799,6 +799,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,
@@ -885,13 +886,19 @@ var createBinanceSolanaDappBrowserConnector = () => createDappBrowserSolanaConne
 });
 
 // src/lib/connectors/okx.ts
+var OKX_CONFIG = {
+  walletId: "okx",
+  wcDeeplink: "okx://wallet/wc",
+  injectedKey: "isOkxWallet"
+};
 var buildOkxBrowseUrl = () => `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(window.location.href)}`;
+var createOkxEvmConnector = () => createWcEvmConnector(OKX_CONFIG);
+var createOkxSolanaConnector = () => createWcSolanaConnector(OKX_CONFIG);
 var createOkxSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "okx",
   injectedKey: "isOkxWallet",
   buildUrl: buildOkxBrowseUrl
 });
-var createOkxSolanaConnector = () => createDownloadOnlySolanaConnector({ walletId: "okx" });
 
 // src/lib/connectors/coinbase.ts
 var buildCoinbaseBrowseUrl = () => `cbwallet://dapp?url=${encodeURIComponent(window.location.href)}`;
@@ -921,7 +928,6 @@ var disconnectWc2 = async () => {
   }
 };
 var createWalletConnectEvmConnector = () => {
-  if (isMobile()) return null;
   return {
     id: walletConfig.id,
     name: walletConfig.name,
@@ -955,7 +961,6 @@ var createWalletConnectEvmConnector = () => {
   };
 };
 var createWalletConnectSolanaConnector = () => {
-  if (isMobile()) return null;
   return {
     id: walletConfig.id,
     name: walletConfig.name,
@@ -999,18 +1004,22 @@ var EVM_FALLBACK_CONNECTORS = [
   ...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];
+  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":
-      return providers.some((p) => p.isCoinbaseWallet);
+      if ("coinbaseWalletExtension" in window) return true;
+      return providers.some(
+        (p) => p.isCoinbaseWallet || p.isCoinbaseBrowser
+      );
     default:
       return true;
   }
@@ -1229,6 +1238,10 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createBinanceSolanaDappBrowserConnector())
   }
 ] : [
+  {
+    id: "metamask",
+    create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector())
+  },
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
   {
     id: "solflare",

package/dist/index.jsx

@@ -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,
@@ -893,13 +894,19 @@ var createBinanceSolanaDappBrowserConnector = () => createDappBrowserSolanaConne
 });
 
 // src/lib/connectors/okx.ts
+var OKX_CONFIG = {
+  walletId: "okx",
+  wcDeeplink: "okx://wallet/wc",
+  injectedKey: "isOkxWallet"
+};
 var buildOkxBrowseUrl = () => `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(window.location.href)}`;
+var createOkxEvmConnector = () => createWcEvmConnector(OKX_CONFIG);
+var createOkxSolanaConnector = () => createWcSolanaConnector(OKX_CONFIG);
 var createOkxSolanaDappBrowserConnector = () => createDappBrowserSolanaConnector({
   walletId: "okx",
   injectedKey: "isOkxWallet",
   buildUrl: buildOkxBrowseUrl
 });
-var createOkxSolanaConnector = () => createDownloadOnlySolanaConnector({ walletId: "okx" });
 
 // src/lib/connectors/coinbase.ts
 var buildCoinbaseBrowseUrl = () => `cbwallet://dapp?url=${encodeURIComponent(window.location.href)}`;
@@ -932,7 +939,6 @@ var disconnectWc2 = async () => {
   }
 };
 var createWalletConnectEvmConnector = () => {
-  if (isMobile()) return null;
   return {
     id: walletConfig.id,
     name: walletConfig.name,
@@ -966,7 +972,6 @@ var createWalletConnectEvmConnector = () => {
   };
 };
 var createWalletConnectSolanaConnector = () => {
-  if (isMobile()) return null;
   return {
     id: walletConfig.id,
     name: walletConfig.name,
@@ -1010,18 +1015,22 @@ var EVM_FALLBACK_CONNECTORS = [
   ...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];
+  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":
-      return providers.some((p) => p.isCoinbaseWallet);
+      if ("coinbaseWalletExtension" in window) return true;
+      return providers.some(
+        (p) => p.isCoinbaseWallet || p.isCoinbaseBrowser
+      );
     default:
       return true;
   }
@@ -1261,6 +1270,10 @@ var SOLANA_FALLBACK_CONNECTORS = isMobile() ? [
     create: () => createSolanaMobileConnector(createBinanceSolanaDappBrowserConnector())
   }
 ] : [
+  {
+    id: "metamask",
+    create: () => createSolanaMobileConnector(createMetaMaskSolanaConnector())
+  },
   { id: "phantom", create: () => createSolanaMobileConnector(createPhantomSolanaConnector()) },
   {
     id: "solflare",

package/dist/lib/connectors/index.d.ts

@@ -5,7 +5,7 @@ export { createTrustEvmMobileConnector, createTrustSolanaMobileConnector, create
 export { createRainbowEvmMobileConnector } from './rainbow';
 export { createRabbyEvmConnector } from './rabby';
 export { createBinanceEvmConnector, createBinanceSolanaConnector, createBinanceSolanaDappBrowserConnector, } from './binance';
-export { createOkxSolanaDappBrowserConnector, createOkxSolanaConnector } from './okx';
+export { createOkxEvmConnector, createOkxSolanaConnector, createOkxSolanaDappBrowserConnector, } from './okx';
 export { createCoinbaseSolanaDappBrowserConnector } from './coinbase';
 export { createBitgetSolanaDappBrowserConnector, createBitgetSolanaConnector } from './bitget';
 export { createWalletConnectEvmConnector, createWalletConnectSolanaConnector, } from './walletconnect';

package/dist/lib/connectors/okx.d.ts

@@ -1,3 +1,5 @@
+import type { EvmWalletConnector } from '../evm';
 import type { SolanaWalletConnector } from '../solana';
-export declare const createOkxSolanaDappBrowserConnector: () => SolanaWalletConnector;
+export declare const createOkxEvmConnector: () => EvmWalletConnector;
 export declare const createOkxSolanaConnector: () => SolanaWalletConnector;
+export declare const createOkxSolanaDappBrowserConnector: () => SolanaWalletConnector;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-buccaneers/wallet-abstraction",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "Solid.js web3 wallet abstraction for EVM and Solana",
   "license": "MIT",
   "author": "Bit Buccaneers",