@meshconnect/web-link-sdk 3.2.13 → 3.2.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/web-link-sdk",
-  "version": "3.2.13",
+  "version": "3.2.14",
   "description": "A client-side JS library for integrating with Mesh Connect",
   "exports": "./index.js",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "util": "^0.12.4"
   },
   "dependencies": {
-    "@meshconnect/node-api": "^2.0.21",
+    "@meshconnect/node-api": "^2.0.22",
     "@meshconnect/solana-web3.js": "^1.0.4",
     "bs58": "^5.0.0",
     "buffer": "^6.0.3",

package/utils/connectors/solana/providerDiscovery.js

@@ -1,3 +1,4 @@
+var _a;
 import { SolanaWalletType } from './types';
 var identifyWalletType = function (provider) {
     if (provider.isPhantom)
@@ -10,25 +11,76 @@ var identifyWalletType = function (provider) {
         return SolanaWalletType.EXODUS;
     return SolanaWalletType.UNKNOWN;
 };
+var walletValidations = (_a = {},
+    _a[SolanaWalletType.PHANTOM] = function (provider) {
+        return provider.isPhantom === true &&
+            provider.isSolflare !== true &&
+            provider.isTrust !== true &&
+            provider.isTrustWallet !== true &&
+            provider.isExodus !== true;
+    },
+    _a[SolanaWalletType.SOLFLARE] = function (provider) {
+        return provider.isSolflare === true &&
+            provider.isPhantom !== true &&
+            provider.isTrust !== true &&
+            provider.isTrustWallet !== true &&
+            provider.isExodus !== true;
+    },
+    _a[SolanaWalletType.TRUST] = function (provider) {
+        return (provider.isTrust === true || provider.isTrustWallet === true) &&
+            provider.isPhantom !== true &&
+            provider.isSolflare !== true &&
+            provider.isExodus !== true;
+    },
+    _a[SolanaWalletType.EXODUS] = function (provider) {
+        return provider.isExodus === true &&
+            provider.isSolflare !== true &&
+            provider.isTrust !== true &&
+            provider.isTrustWallet !== true;
+    },
+    // Note: Exodus may also inject isPhantom, so we don't exclude it
+    _a[SolanaWalletType.UNKNOWN] = function (provider) {
+        return provider.isPhantom !== true &&
+            provider.isSolflare !== true &&
+            provider.isTrust !== true &&
+            provider.isTrustWallet !== true &&
+            provider.isExodus !== true;
+    },
+    _a);
 var getProviderByType = function (type) {
-    var _a, _b, _c, _d;
-    // First try to get the provider directly using the wallet name
-    var dynamicProvider = (_a = window[type]) === null || _a === void 0 ? void 0 : _a.solana;
-    if (dynamicProvider) {
-        return dynamicProvider;
-    }
+    var _a, _b, _c;
     // Then check known provider locations
     switch (type) {
         case SolanaWalletType.PHANTOM:
-            return (_b = window.phantom) === null || _b === void 0 ? void 0 : _b.solana;
+            if (((_a = window.phantom) === null || _a === void 0 ? void 0 : _a.solana) &&
+                walletValidations[type](window.phantom.solana)) {
+                return window.phantom.solana;
+            }
+            return undefined;
         case SolanaWalletType.SOLFLARE:
-            return window.solflare;
+            if (window.solflare && walletValidations[type](window.solflare)) {
+                return window.solflare;
+            }
+            return undefined;
         case SolanaWalletType.TRUST:
-            return (_c = window.trustwallet) === null || _c === void 0 ? void 0 : _c.solana;
+            if (((_b = window.trustwallet) === null || _b === void 0 ? void 0 : _b.solana) &&
+                walletValidations[type](window.trustwallet.solana)) {
+                return window.trustwallet.solana;
+            }
+            return undefined;
         case SolanaWalletType.EXODUS:
-            return (_d = window.exodus) === null || _d === void 0 ? void 0 : _d.solana;
+            if (((_c = window.exodus) === null || _c === void 0 ? void 0 : _c.solana) &&
+                walletValidations[type](window.exodus.solana)) {
+                return window.exodus.solana;
+            }
+            return undefined;
         case SolanaWalletType.UNKNOWN:
-            return window.solana;
+            if (window.solana && walletValidations[type](window.solana)) {
+                return window.solana;
+            }
+            return undefined;
+        default:
+            return undefined;
     }
 };
 export var findAvailableSolanaProviders = function () {

package/utils/connectors/solana/types.d.ts

@@ -36,15 +36,14 @@ export interface SolanaProvider {
         signature: string;
     }>;
     sendTransaction?(transaction: Transaction | VersionedTransaction): Promise<string>;
+    isPhantom?: boolean;
+    isSolflare?: boolean;
+    isTrust?: boolean;
+    isTrustWallet?: boolean;
+    isExodus?: boolean;
 }
 export interface WindowWithSolanaProviders extends Window {
-    solana?: SolanaProvider & {
-        isPhantom?: boolean;
-        isSolflare?: boolean;
-        isTrust?: boolean;
-        isTrustWallet?: boolean;
-        isExodus?: boolean;
-    };
+    solana?: SolanaProvider;
     phantom?: {
         solana?: SolanaProvider;
     };

package/utils/version.d.ts

@@ -1 +1 @@
-export declare const sdkVersion = "3.2.13";
+export declare const sdkVersion = "3.2.14";

package/utils/version.js

@@ -1 +1 @@
-export var sdkVersion = '3.2.13';
+export var sdkVersion = '3.2.14';