@dynamic-labs/multi-wallet 0.17.0-RC.7 → 0.17.0-RC.9

package/src/wallets/solana/phantom.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var tslib = require('tslib');
-var isMobile = require('../../utils/isMobile.cjs');
+var utils = require('@dynamic-labs/utils');
 var solWalletConnector = require('./solWalletConnector.cjs');
 var solProviderHelper = require('./solProviderHelper.cjs');
 
@@ -9,24 +9,21 @@ class Phantom extends solWalletConnector.SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'Phantom';
-        this.solProviderHelper = new solProviderHelper.SolProviderHelper();
     }
     setupEventListeners(listeners) {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper._setupEventListeners(listeners, this.solProviderHelper.findProvider(this.name));
-        });
+        solProviderHelper.SolProviderHelper._setupEventListeners(listeners, solProviderHelper.SolProviderHelper.findProvider(this.name));
     }
     teardownEventListeners() {
-        this.solProviderHelper._teardownEventListeners(this.name);
+        solProviderHelper.SolProviderHelper._teardownEventListeners(this.name);
     }
     connect() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.solProviderHelper.connectWithName(this.name);
+            yield solProviderHelper.SolProviderHelper.connectWithName(this.name);
         });
     }
     getSigner() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.connectWithName(this.name);
+            return solProviderHelper.SolProviderHelper.connectWithName(this.name);
         });
     }
     isInstalledOnBrowser() {
@@ -37,19 +34,18 @@ class Phantom extends solWalletConnector.SolWalletConnector {
          * It relies on the fact that if both Glow and Phantom are enabled,
          * solana.isGlow will return false.
          */
-        return (this.solProviderHelper.isInstalledHelper(this.name) &&
-            !((_a = window.solana) === null || _a === void 0 ? void 0 : _a.isGlow));
+        return (solProviderHelper.SolProviderHelper.isInstalledHelper(this.name) && !((_a = window.solana) === null || _a === void 0 ? void 0 : _a.isGlow));
     }
     fetchPublicAddress() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+                return solProviderHelper.SolProviderHelper.fetchPublicAddressWithName(this.name);
             }
             const url = encodeURIComponent(window.location.toString());
             const ref = encodeURIComponent(window.location.origin);
             // samsung browser only supports native links, not universal links
-            if (isMobile.isMobile()) {
-                if (isMobile.isSamsungBrowser()) {
+            if (utils.isMobile()) {
+                if (utils.isSamsungBrowser()) {
                     window.location.assign(`phantom://browse/${url}?ref=${ref}`);
                 }
                 else {
@@ -61,12 +57,12 @@ class Phantom extends solWalletConnector.SolWalletConnector {
     }
     signMessage(messageToSign) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.signMessageWithName(messageToSign, this.name);
+            return solProviderHelper.SolProviderHelper.signMessageWithName(messageToSign, this.name);
         });
     }
     getConnectedAccounts() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.getConnectedAccountsWithName(this.name);
+            return solProviderHelper.SolProviderHelper.getConnectedAccountsWithName(this.name);
         });
     }
 }

package/src/wallets/solana/phantom.d.ts

@@ -1,11 +1,9 @@
 import { WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { ISolana } from '../window';
 import { SolWalletConnector } from './solWalletConnector';
-import { SolProviderHelper } from './solProviderHelper';
 declare class Phantom extends SolWalletConnector {
     name: string;
-    solProviderHelper: SolProviderHelper;
-    setupEventListeners(listeners: WalletEventListeners): Promise<() => void>;
+    setupEventListeners(listeners: WalletEventListeners): void;
     teardownEventListeners(): void;
     connect(): Promise<void>;
     getSigner(): Promise<ISolana | undefined>;

package/src/wallets/solana/phantom.js

@@ -1,5 +1,5 @@
 import { __awaiter } from 'tslib';
-import { isMobile, isSamsungBrowser } from '../../utils/isMobile.js';
+import { isMobile, isSamsungBrowser } from '@dynamic-labs/utils';
 import { SolWalletConnector } from './solWalletConnector.js';
 import { SolProviderHelper } from './solProviderHelper.js';
 
@@ -7,24 +7,21 @@ class Phantom extends SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'Phantom';
-        this.solProviderHelper = new SolProviderHelper();
     }
     setupEventListeners(listeners) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper._setupEventListeners(listeners, this.solProviderHelper.findProvider(this.name));
-        });
+        SolProviderHelper._setupEventListeners(listeners, SolProviderHelper.findProvider(this.name));
     }
     teardownEventListeners() {
-        this.solProviderHelper._teardownEventListeners(this.name);
+        SolProviderHelper._teardownEventListeners(this.name);
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.solProviderHelper.connectWithName(this.name);
+            yield SolProviderHelper.connectWithName(this.name);
         });
     }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.connectWithName(this.name);
+            return SolProviderHelper.connectWithName(this.name);
         });
     }
     isInstalledOnBrowser() {
@@ -35,13 +32,12 @@ class Phantom extends SolWalletConnector {
          * It relies on the fact that if both Glow and Phantom are enabled,
          * solana.isGlow will return false.
          */
-        return (this.solProviderHelper.isInstalledHelper(this.name) &&
-            !((_a = window.solana) === null || _a === void 0 ? void 0 : _a.isGlow));
+        return (SolProviderHelper.isInstalledHelper(this.name) && !((_a = window.solana) === null || _a === void 0 ? void 0 : _a.isGlow));
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+                return SolProviderHelper.fetchPublicAddressWithName(this.name);
             }
             const url = encodeURIComponent(window.location.toString());
             const ref = encodeURIComponent(window.location.origin);
@@ -59,12 +55,12 @@ class Phantom extends SolWalletConnector {
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.signMessageWithName(messageToSign, this.name);
+            return SolProviderHelper.signMessageWithName(messageToSign, this.name);
         });
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.getConnectedAccountsWithName(this.name);
+            return SolProviderHelper.getConnectedAccountsWithName(this.name);
         });
     }
 }

package/src/wallets/solana/slope.cjs

@@ -2,7 +2,7 @@
 
 var tslib = require('tslib');
 var web3_js = require('@solana/web3.js');
-var logger = require('../../utils/logger.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var solWalletConnector = require('./solWalletConnector.cjs');
 
 class Slope extends solWalletConnector.SolWalletConnector {
@@ -44,7 +44,7 @@ class Slope extends solWalletConnector.SolWalletConnector {
                 return balance.toString();
             }
             catch (e) {
-                logger.logger.debug(e);
+                walletConnectorCore.logger.debug(e);
                 return undefined;
             }
         });
@@ -61,7 +61,7 @@ class Slope extends solWalletConnector.SolWalletConnector {
                 return this.isConnectData(response) ? response.data.publicKey : undefined;
             }
             catch (e) {
-                logger.logger.debug(e);
+                walletConnectorCore.logger.debug(e);
                 return undefined;
             }
         });
@@ -78,7 +78,7 @@ class Slope extends solWalletConnector.SolWalletConnector {
                     : undefined;
             }
             catch (e) {
-                logger.logger.debug(e);
+                walletConnectorCore.logger.debug(e);
                 return undefined;
             }
         });

package/src/wallets/solana/slope.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import { PublicKey } from '@solana/web3.js';
-import { logger } from '../../utils/logger.js';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { SolWalletConnector } from './solWalletConnector.js';
 
 class Slope extends SolWalletConnector {

package/src/wallets/solana/solProviderHelper.cjs

@@ -3,45 +3,18 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var convertors = require('../../utils/convertors.cjs');
-var ProviderLookup = require('../ProviderLookup.cjs');
-var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
 
+var _a;
 class SolProviderHelper {
-    constructor() {
-        this.GlowProvider = () => this.installedProviderLookup([{ flag: 'isGlow', value: true }]);
-        this.CoinbaseProvider = () => this.findSolanaProviders(window.coinbaseSolana)[0];
-        this.PhantomProvider = () => this.installedProviderLookup([
-            { flag: 'isPhantom', value: true },
-            { flag: 'isBraveWallet', value: false },
-            { flag: 'isExodus', value: false },
-        ]);
-        this.SolflareProvider = () => this.installedProviderLookup([{ flag: 'isSolflare', value: true }]);
-        this.BraveProvider = () => this.installedProviderLookup([
-            { flag: 'isPhantom', value: true },
-            { flag: 'isBraveWallet', value: true },
-        ]);
-        this.ExodusProvider = () => this.installedProviderLookup([
-            { flag: 'isPhantom', value: true },
-            { flag: 'isExodus', value: true },
-        ]);
-        this.providers = {
-            bravesol: this.BraveProvider,
-            coinbasesolana: this.CoinbaseProvider,
-            exodussol: this.ExodusProvider,
-            glow: this.GlowProvider,
-            phantom: this.PhantomProvider,
-            phantomledger: this.PhantomProvider,
-            solflare: this.SolflareProvider,
-        };
+    static installedProviderLookup(providerFlags) {
+        return walletConnectorCore.ProviderLookup(this.allInstalledProviders(), providerFlags);
     }
-    installedProviderLookup(providerFlags) {
-        return ProviderLookup.ProviderLookup(this.allInstalledProviders(), providerFlags);
-    }
-    allInstalledProviders() {
+    static allInstalledProviders() {
         return this.findSolanaProviders(window.solana).concat(this.findSolanaProviders(window.solflare), this.findSolanaProviders(window.glowSolana));
     }
-    findSolanaProviders(solana) {
+    static findSolanaProviders(solana) {
         const solanaProviders = [];
         if (solana && !solana.providers) {
             solanaProviders.push(solana);
@@ -53,14 +26,14 @@ class SolProviderHelper {
         }
         return solanaProviders;
     }
-    isInstalledHelper(walletName) {
+    static isInstalledHelper(walletName) {
         return this.findProvider(walletName) !== undefined;
     }
-    findProvider(walletName) {
-        var _a, _b;
-        return (_b = (_a = this.providers)[normalizeWalletName.normalizeWalletName(walletName)]) === null || _b === void 0 ? void 0 : _b.call(_a);
+    static findProvider(walletName) {
+        var _b, _c;
+        return (_c = (_b = this.providers)[walletConnectorCore.normalizeWalletName(walletName)]) === null || _c === void 0 ? void 0 : _c.call(_b);
     }
-    fetchPublicAddressWithName(name) {
+    static fetchPublicAddressWithName(name) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = this.findProvider(name);
             if (!provider) {
@@ -71,7 +44,7 @@ class SolProviderHelper {
             return publicKey ? publicKey.toString() : Promise.resolve(undefined);
         });
     }
-    connectWithName(name) {
+    static connectWithName(name) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = this.findProvider(name);
             if (!provider) {
@@ -86,7 +59,7 @@ class SolProviderHelper {
             }
         });
     }
-    signMessageWithName(messageToSign, name) {
+    static signMessageWithName(messageToSign, name) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const walletAddress = yield this.fetchPublicAddressWithName(name);
             if (!walletAddress) {
@@ -103,36 +76,35 @@ class SolProviderHelper {
             }));
         });
     }
-    _setupEventListeners(listeners, web3Provider) {
+    static _setupEventListeners(listeners, web3Provider) {
         const handleAccountChange = (address) => tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _b, _c, _d;
             if (!address) {
                 yield (web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.connect());
-                if ((_a = web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.publicKey) === null || _a === void 0 ? void 0 : _a.toString()) {
-                    (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, [web3Provider.publicKey.toString()]);
+                if ((_b = web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString()) {
+                    (_c = listeners.onAccountChange) === null || _c === void 0 ? void 0 : _c.call(listeners, [web3Provider.publicKey.toString()]);
                 }
                 return;
             }
             if (address.toString()) {
-                yield ((_c = listeners.onAccountChange) === null || _c === void 0 ? void 0 : _c.call(listeners, [address.toString()]));
+                yield ((_d = listeners.onAccountChange) === null || _d === void 0 ? void 0 : _d.call(listeners, [address.toString()]));
             }
         });
         const handleDisconnect = () => tslib.__awaiter(this, void 0, void 0, function* () {
-            var _d;
-            yield ((_d = listeners.onDisconnect) === null || _d === void 0 ? void 0 : _d.call(listeners));
+            var _e;
+            yield ((_e = listeners.onDisconnect) === null || _e === void 0 ? void 0 : _e.call(listeners));
         });
         web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('accountChanged', handleAccountChange);
         web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('disconnect', handleDisconnect);
-        return () => { };
     }
-    _teardownEventListeners(name) {
+    static _teardownEventListeners(name) {
         const web3Provider = this.findProvider(name);
         if (!web3Provider) {
             return;
         }
         web3Provider.removeAllListeners();
     }
-    getConnectedAccountsWithName(name) {
+    static getConnectedAccountsWithName(name) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = this.findProvider(name);
             if (!provider) {
@@ -159,6 +131,32 @@ class SolProviderHelper {
             }
         });
     }
-}
+}
+_a = SolProviderHelper;
+SolProviderHelper.GlowProvider = () => _a.installedProviderLookup([{ flag: 'isGlow', value: true }]);
+SolProviderHelper.CoinbaseProvider = () => _a.findSolanaProviders(window.coinbaseSolana)[0];
+SolProviderHelper.PhantomProvider = () => _a.installedProviderLookup([
+    { flag: 'isPhantom', value: true },
+    { flag: 'isBraveWallet', value: false },
+    { flag: 'isExodus', value: false },
+]);
+SolProviderHelper.SolflareProvider = () => _a.installedProviderLookup([{ flag: 'isSolflare', value: true }]);
+SolProviderHelper.BraveProvider = () => _a.installedProviderLookup([
+    { flag: 'isPhantom', value: true },
+    { flag: 'isBraveWallet', value: true },
+]);
+SolProviderHelper.ExodusProvider = () => _a.installedProviderLookup([
+    { flag: 'isPhantom', value: true },
+    { flag: 'isExodus', value: true },
+]);
+SolProviderHelper.providers = {
+    bravesol: _a.BraveProvider,
+    coinbasesolana: _a.CoinbaseProvider,
+    exodussol: _a.ExodusProvider,
+    glow: _a.GlowProvider,
+    phantom: _a.PhantomProvider,
+    phantomledger: _a.PhantomProvider,
+    solflare: _a.SolflareProvider,
+};
 
 exports.SolProviderHelper = SolProviderHelper;

package/src/wallets/solana/solProviderHelper.d.ts

@@ -1,29 +1,29 @@
-import { WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-import { ISolana, ProviderCondition } from '../window';
+import { ProviderCondition, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { ISolana, SolProviderFlag } from '../window';
 export interface SignedMessage {
     signature: Uint8Array;
 }
 type Provider = () => ISolana | undefined;
 export declare class SolProviderHelper {
-    GlowProvider: Provider;
-    CoinbaseProvider: Provider;
-    PhantomProvider: Provider;
-    SolflareProvider: Provider;
-    BraveProvider: Provider;
-    ExodusProvider: Provider;
-    providers: {
+    static GlowProvider: Provider;
+    static CoinbaseProvider: Provider;
+    static PhantomProvider: Provider;
+    static SolflareProvider: Provider;
+    static BraveProvider: Provider;
+    static ExodusProvider: Provider;
+    static providers: {
         [wallet: string]: Provider;
     };
-    installedProviderLookup(providerFlags: Array<ProviderCondition>): ISolana | undefined;
-    allInstalledProviders(): ISolana[];
-    findSolanaProviders(solana?: ISolana): ISolana[];
-    isInstalledHelper(walletName: string): boolean;
-    findProvider(walletName: string): ISolana | undefined;
-    fetchPublicAddressWithName(name: string): Promise<string | undefined>;
-    connectWithName(name: string): Promise<ISolana | undefined>;
-    signMessageWithName(messageToSign: string, name: string): Promise<string | undefined>;
-    _setupEventListeners(listeners: WalletEventListeners, web3Provider?: ISolana): () => void;
-    _teardownEventListeners(name: string): void;
-    getConnectedAccountsWithName(name: string): Promise<string[]>;
+    static installedProviderLookup(providerFlags: Array<ProviderCondition<SolProviderFlag>>): ISolana | undefined;
+    static allInstalledProviders(): ISolana[];
+    static findSolanaProviders(solana?: ISolana): ISolana[];
+    static isInstalledHelper(walletName: string): boolean;
+    static findProvider(walletName: string): ISolana | undefined;
+    static fetchPublicAddressWithName(name: string): Promise<string | undefined>;
+    static connectWithName(name: string): Promise<ISolana | undefined>;
+    static signMessageWithName(messageToSign: string, name: string): Promise<string | undefined>;
+    static _setupEventListeners(listeners: WalletEventListeners, web3Provider?: ISolana): void;
+    static _teardownEventListeners(name: string): void;
+    static getConnectedAccountsWithName(name: string): Promise<string[]>;
 }
 export {};

package/src/wallets/solana/solProviderHelper.js

@@ -1,43 +1,16 @@
 import { __awaiter } from 'tslib';
+import { ProviderLookup, normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 import { bufferToBase64 } from '../../utils/convertors.js';
-import { ProviderLookup } from '../ProviderLookup.js';
-import { normalizeWalletName } from '../../utils/normalizeWalletName/normalizeWalletName.js';
 
+var _a;
 class SolProviderHelper {
-    constructor() {
-        this.GlowProvider = () => this.installedProviderLookup([{ flag: 'isGlow', value: true }]);
-        this.CoinbaseProvider = () => this.findSolanaProviders(window.coinbaseSolana)[0];
-        this.PhantomProvider = () => this.installedProviderLookup([
-            { flag: 'isPhantom', value: true },
-            { flag: 'isBraveWallet', value: false },
-            { flag: 'isExodus', value: false },
-        ]);
-        this.SolflareProvider = () => this.installedProviderLookup([{ flag: 'isSolflare', value: true }]);
-        this.BraveProvider = () => this.installedProviderLookup([
-            { flag: 'isPhantom', value: true },
-            { flag: 'isBraveWallet', value: true },
-        ]);
-        this.ExodusProvider = () => this.installedProviderLookup([
-            { flag: 'isPhantom', value: true },
-            { flag: 'isExodus', value: true },
-        ]);
-        this.providers = {
-            bravesol: this.BraveProvider,
-            coinbasesolana: this.CoinbaseProvider,
-            exodussol: this.ExodusProvider,
-            glow: this.GlowProvider,
-            phantom: this.PhantomProvider,
-            phantomledger: this.PhantomProvider,
-            solflare: this.SolflareProvider,
-        };
-    }
-    installedProviderLookup(providerFlags) {
+    static installedProviderLookup(providerFlags) {
         return ProviderLookup(this.allInstalledProviders(), providerFlags);
     }
-    allInstalledProviders() {
+    static allInstalledProviders() {
         return this.findSolanaProviders(window.solana).concat(this.findSolanaProviders(window.solflare), this.findSolanaProviders(window.glowSolana));
     }
-    findSolanaProviders(solana) {
+    static findSolanaProviders(solana) {
         const solanaProviders = [];
         if (solana && !solana.providers) {
             solanaProviders.push(solana);
@@ -49,14 +22,14 @@ class SolProviderHelper {
         }
         return solanaProviders;
     }
-    isInstalledHelper(walletName) {
+    static isInstalledHelper(walletName) {
         return this.findProvider(walletName) !== undefined;
     }
-    findProvider(walletName) {
-        var _a, _b;
-        return (_b = (_a = this.providers)[normalizeWalletName(walletName)]) === null || _b === void 0 ? void 0 : _b.call(_a);
+    static findProvider(walletName) {
+        var _b, _c;
+        return (_c = (_b = this.providers)[normalizeWalletName(walletName)]) === null || _c === void 0 ? void 0 : _c.call(_b);
     }
-    fetchPublicAddressWithName(name) {
+    static fetchPublicAddressWithName(name) {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.findProvider(name);
             if (!provider) {
@@ -67,7 +40,7 @@ class SolProviderHelper {
             return publicKey ? publicKey.toString() : Promise.resolve(undefined);
         });
     }
-    connectWithName(name) {
+    static connectWithName(name) {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.findProvider(name);
             if (!provider) {
@@ -82,7 +55,7 @@ class SolProviderHelper {
             }
         });
     }
-    signMessageWithName(messageToSign, name) {
+    static signMessageWithName(messageToSign, name) {
         return __awaiter(this, void 0, void 0, function* () {
             const walletAddress = yield this.fetchPublicAddressWithName(name);
             if (!walletAddress) {
@@ -99,36 +72,35 @@ class SolProviderHelper {
             }));
         });
     }
-    _setupEventListeners(listeners, web3Provider) {
+    static _setupEventListeners(listeners, web3Provider) {
         const handleAccountChange = (address) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _b, _c, _d;
             if (!address) {
                 yield (web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.connect());
-                if ((_a = web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.publicKey) === null || _a === void 0 ? void 0 : _a.toString()) {
-                    (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, [web3Provider.publicKey.toString()]);
+                if ((_b = web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString()) {
+                    (_c = listeners.onAccountChange) === null || _c === void 0 ? void 0 : _c.call(listeners, [web3Provider.publicKey.toString()]);
                 }
                 return;
             }
             if (address.toString()) {
-                yield ((_c = listeners.onAccountChange) === null || _c === void 0 ? void 0 : _c.call(listeners, [address.toString()]));
+                yield ((_d = listeners.onAccountChange) === null || _d === void 0 ? void 0 : _d.call(listeners, [address.toString()]));
             }
         });
         const handleDisconnect = () => __awaiter(this, void 0, void 0, function* () {
-            var _d;
-            yield ((_d = listeners.onDisconnect) === null || _d === void 0 ? void 0 : _d.call(listeners));
+            var _e;
+            yield ((_e = listeners.onDisconnect) === null || _e === void 0 ? void 0 : _e.call(listeners));
         });
         web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('accountChanged', handleAccountChange);
         web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('disconnect', handleDisconnect);
-        return () => { };
     }
-    _teardownEventListeners(name) {
+    static _teardownEventListeners(name) {
         const web3Provider = this.findProvider(name);
         if (!web3Provider) {
             return;
         }
         web3Provider.removeAllListeners();
     }
-    getConnectedAccountsWithName(name) {
+    static getConnectedAccountsWithName(name) {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.findProvider(name);
             if (!provider) {
@@ -155,6 +127,32 @@ class SolProviderHelper {
             }
         });
     }
-}
+}
+_a = SolProviderHelper;
+SolProviderHelper.GlowProvider = () => _a.installedProviderLookup([{ flag: 'isGlow', value: true }]);
+SolProviderHelper.CoinbaseProvider = () => _a.findSolanaProviders(window.coinbaseSolana)[0];
+SolProviderHelper.PhantomProvider = () => _a.installedProviderLookup([
+    { flag: 'isPhantom', value: true },
+    { flag: 'isBraveWallet', value: false },
+    { flag: 'isExodus', value: false },
+]);
+SolProviderHelper.SolflareProvider = () => _a.installedProviderLookup([{ flag: 'isSolflare', value: true }]);
+SolProviderHelper.BraveProvider = () => _a.installedProviderLookup([
+    { flag: 'isPhantom', value: true },
+    { flag: 'isBraveWallet', value: true },
+]);
+SolProviderHelper.ExodusProvider = () => _a.installedProviderLookup([
+    { flag: 'isPhantom', value: true },
+    { flag: 'isExodus', value: true },
+]);
+SolProviderHelper.providers = {
+    bravesol: _a.BraveProvider,
+    coinbasesolana: _a.CoinbaseProvider,
+    exodussol: _a.ExodusProvider,
+    glow: _a.GlowProvider,
+    phantom: _a.PhantomProvider,
+    phantomledger: _a.PhantomProvider,
+    solflare: _a.SolflareProvider,
+};
 
 export { SolProviderHelper };

package/src/wallets/solana/solWalletConnector.cjs

@@ -6,7 +6,7 @@ var tslib = require('tslib');
 var web3_js = require('@solana/web3.js');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var rpcProviders = require('@dynamic-labs/rpc-providers');
-var errors = require('../../errors.cjs');
+var utils = require('@dynamic-labs/utils');
 
 class SolWalletConnector extends walletConnectorCore.WalletConnectorBase {
     constructor({ solNetworks, chainRpcProviders }) {
@@ -37,7 +37,7 @@ class SolWalletConnector extends walletConnectorCore.WalletConnectorBase {
         var _a;
         const [network] = this.solNetworks;
         if (!network) {
-            throw new errors.DynamicError('No enabled networks');
+            throw new utils.DynamicError('No enabled networks');
         }
         const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
         return new web3_js.Connection(rpcUrl, 'confirmed');

package/src/wallets/solana/solWalletConnector.js

@@ -2,7 +2,7 @@ import { __awaiter } from 'tslib';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { ProviderChain } from '@dynamic-labs/rpc-providers';
-import { DynamicError } from '../../errors.js';
+import { DynamicError } from '@dynamic-labs/utils';
 
 class SolWalletConnector extends WalletConnectorBase {
     constructor({ solNetworks, chainRpcProviders }) {