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

package/src/wallets/{clients/walletConnect/walletConnect.d.ts → cosmos/wcClient.lib.d.ts}

@@ -1,23 +1,20 @@
 import Client from '@walletconnect/client';
-import { ethers } from 'ethers';
-import { FetchPublicAddressOpts, PayloadParams, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
-import { KeplrWalletConnectV1 } from '../../cosmos/wcClient';
+import { FetchPublicAddressOpts, PayloadParams, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { KeplrWalletConnectV1 } from './wcClient';
 export declare const initClient: (name: string, settings?: any) => Client;
-/**
- * Attach event handlers to WalletConnect events.
- */
-export declare const setupWalletConnectEventListeners: (opts: WalletEventListeners, client: Client) => (() => void);
-export declare const teardownWalletConnectEventListeners: (client: Client) => void;
 /**
  * Initialize a client from a stored session and terminate the connection.
  */
 export declare const killWalletConnectSession: (client: Client) => Promise<void>;
+/**
+ * Attach event handlers to WalletConnect events.
+ */
+export declare const setupWalletConnectEventListeners: (opts: WalletEventListeners, client: Client) => void;
+export declare const teardownWalletConnectEventListeners: (client: Client) => void;
+export declare const useDeepLink: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => void;
 export declare const getDeepLink: (uri: string, metadata: WalletSchema, { removeWCUri, }?: {
     removeWCUri?: boolean | undefined;
 }) => string;
 export declare const createSession: (client: Client) => Promise<PayloadParams>;
-export declare const useDeepLink: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => void;
 export declare const fetchWalletConnectCosmosPublicAddress: (metadata: WalletSchema, wcClient: Client, provider: KeplrWalletConnectV1, opts: FetchPublicAddressOpts & Required<Pick<FetchPublicAddressOpts, 'chainId'>>) => Promise<string>;
-export declare const fetchWalletConnectEVMPublicAddress: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => Promise<string | undefined>;
-export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletSchema, client: Client, rpcProvider?: () => Promise<ethers.providers.JsonRpcProvider | undefined>) => Promise<string | undefined>;

package/src/wallets/cosmos/wcClient.lib.js

@@ -0,0 +1,126 @@
+import { __awaiter } from 'tslib';
+import Client from '@walletconnect/client';
+import { logger, isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { isMobile, isIOS } from '@dynamic-labs/utils';
+
+const initClient = (name, settings) => {
+    const storageId = `walletconnect-${name}`;
+    const session = localStorage.getItem(storageId);
+    const clientArgs = session
+        ? { session: JSON.parse(session), storageId }
+        : { bridge: 'https://bridge.walletconnect.org', storageId };
+    return new Client(Object.assign(Object.assign({}, clientArgs), settings));
+};
+/**
+ * Initialize a client from a stored session and terminate the connection.
+ */
+const killWalletConnectSession = (client) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        if (client === null || client === void 0 ? void 0 : client.connected) {
+            yield client.killSession();
+        }
+    }
+    catch (e) {
+        logger.debug(e);
+    }
+});
+/**
+ * Attach event handlers to WalletConnect events.
+ */
+const setupWalletConnectEventListeners = (opts, client) => {
+    if (!client) {
+        return;
+    }
+    let prevAccount;
+    let prevChain;
+    if (client.connected) {
+        // eslint-disable-next-line prefer-destructuring
+        prevAccount = client.accounts[0];
+        prevChain = client.chainId;
+    }
+    client.on('disconnect', () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        yield ((_a = opts.onDisconnect) === null || _a === void 0 ? void 0 : _a.call(opts));
+    }));
+    client.on('session_update', (_, payload) => __awaiter(void 0, void 0, void 0, function* () {
+        var _b, _c;
+        // eslint-disable-next-line prefer-destructuring
+        const { accounts, chainId } = payload.params[0];
+        const didAccountChange = !isSameAddress(prevAccount || '', accounts[0], 'eip155');
+        const didChainChange = prevChain !== chainId;
+        // eslint-disable-next-line prefer-destructuring
+        prevAccount = accounts[0];
+        prevChain = chainId;
+        if (didAccountChange) {
+            yield ((_b = opts.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(opts, accounts));
+        }
+        if (didChainChange) {
+            yield ((_c = opts.onChainChange) === null || _c === void 0 ? void 0 : _c.call(opts, String(chainId)));
+        }
+    }));
+};
+const teardownWalletConnectEventListeners = (client) => {
+    client.off('disconnect');
+    client.off('session_update');
+};
+const useDeepLink = (metadata, wcClient, opts) => {
+    var _a, _b, _c;
+    const deepLink = getDeepLink(wcClient.uri, metadata);
+    if (isMobile()) {
+        window.location.href = deepLink;
+    }
+    else {
+        if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.desktop) === null || _a === void 0 ? void 0 : _a.native) {
+            (_b = opts === null || opts === void 0 ? void 0 : opts.onDesktopUri) === null || _b === void 0 ? void 0 : _b.call(opts, deepLink);
+        }
+        (_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts, wcClient.uri);
+    }
+};
+const getDeepLink = (uri, metadata, { removeWCUri = false, } = {}) => {
+    var _a, _b, _c, _d;
+    if (!isMobile()) {
+        const origin = ((_a = metadata.desktop) === null || _a === void 0 ? void 0 : _a.universal) || ((_b = metadata.desktop) === null || _b === void 0 ? void 0 : _b.native);
+        if (removeWCUri)
+            return origin || '';
+        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
+    }
+    // deeplinks for ios require special treatment
+    // see: https://docs.walletconnect.com/mobile-linking#for-ios
+    else if (isIOS()) {
+        const origin = ((_c = metadata.mobile) === null || _c === void 0 ? void 0 : _c.universal) || ((_d = metadata.mobile) === null || _d === void 0 ? void 0 : _d.native);
+        if (removeWCUri)
+            return origin || '';
+        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
+    }
+    // on android, the deeplink is simply the uri
+    // see: https://docs.walletconnect.com/mobile-linking#for-android
+    return uri;
+};
+const createSession = (client) => __awaiter(void 0, void 0, void 0, function* () {
+    return new Promise((resolve, reject) => {
+        client.on('connect', (error, payload) => __awaiter(void 0, void 0, void 0, function* () {
+            if (error)
+                throw error;
+            resolve(payload);
+        }));
+        client.on('disconnect', (error, payload) => {
+            reject(error || payload.params[0].message);
+        });
+    });
+});
+const fetchWalletConnectCosmosPublicAddress = (metadata, wcClient, provider, opts) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    if (wcClient.connected) {
+        const key = yield provider.getKey(opts.chainId);
+        return key.bech32Address;
+    }
+    yield wcClient.createSession();
+    useDeepLink(metadata, wcClient, opts);
+    const payload = yield createSession(wcClient);
+    const key = yield provider.getKey(opts.chainId);
+    (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
+    wcClient.accounts = [key.bech32Address];
+    return key.bech32Address;
+});
+
+export { createSession, fetchWalletConnectCosmosPublicAddress, getDeepLink, initClient, killWalletConnectSession, setupWalletConnectEventListeners, teardownWalletConnectEventListeners, useDeepLink };

package/src/wallets/flow/FlowWalletConnector.cjs

@@ -5,8 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var fcl = require('@onflow/fcl');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var errors = require('../../errors.cjs');
-var logger = require('../../utils/logger.cjs');
+var utils = require('@dynamic-labs/utils');
 
 const get = (key) => {
     if (typeof window === 'undefined') {
@@ -19,7 +18,7 @@ const get = (key) => {
         }
     }
     catch (e) {
-        logger.logger.error(e);
+        walletConnectorCore.logger.error(e);
     }
     return undefined;
 };
@@ -73,7 +72,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 return user.addr;
             }
             catch (error) {
-                logger.logger.error(error);
+                walletConnectorCore.logger.error(error);
                 return undefined;
             }
         });
@@ -94,7 +93,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 return JSON.stringify(data);
             }
             catch (error) {
-                logger.logger.error(error);
+                walletConnectorCore.logger.error(error);
                 return undefined;
             }
         });
@@ -104,7 +103,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
             const message = Buffer.from(messageToSign).toString('hex');
             const signedMessage = yield fcl.currentUser().signUserMessage(message);
             if (signedMessage.includes('Declined')) {
-                throw new errors.DynamicError('User declined the signature');
+                throw new utils.DynamicError('User declined the signature');
             }
             return JSON.stringify(signedMessage);
         });
@@ -124,7 +123,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
                     return yield fcl.send([fcl.script(code)]).then(fcl.decode);
                 }
                 catch (error) {
-                    logger.logger.error(error);
+                    walletConnectorCore.logger.error(error);
                     return undefined;
                 }
             }
@@ -140,7 +139,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     switchNetwork() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            throw new errors.DynamicError('Not supported');
+            throw new utils.DynamicError('Not supported');
         });
     }
     getConnectedAccounts() {

package/src/wallets/flow/FlowWalletConnector.js

@@ -1,8 +1,7 @@
 import { __awaiter } from 'tslib';
 import { currentUser, config, send, script, decode } from '@onflow/fcl';
-import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { DynamicError } from '../../errors.js';
-import { logger } from '../../utils/logger.js';
+import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError } from '@dynamic-labs/utils';
 
 const get = (key) => {
     if (typeof window === 'undefined') {

package/src/wallets/flow/lilico.cjs

@@ -2,7 +2,7 @@
 
 var tslib = require('tslib');
 var fcl = require('@onflow/fcl');
-var isMobile = require('../../utils/isMobile.cjs');
+var utils = require('@dynamic-labs/utils');
 var FlowWalletConnector = require('./FlowWalletConnector.cjs');
 
 class Lilico extends FlowWalletConnector.FlowWalletConnector {
@@ -27,7 +27,7 @@ class Lilico extends FlowWalletConnector.FlowWalletConnector {
     }
     signDelay() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            if (isMobile.isMobile()) {
+            if (utils.isMobile()) {
                 return Promise.resolve();
             }
             return new Promise((resolve) => {

package/src/wallets/flow/lilico.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import { config } from '@onflow/fcl';
-import { isMobile } from '../../utils/isMobile.js';
+import { isMobile } from '@dynamic-labs/utils';
 import { FlowWalletConnector } from './FlowWalletConnector.js';
 
 class Lilico extends FlowWalletConnector {

package/src/wallets/solana/CoinbaseSolana.cjs

@@ -8,45 +8,42 @@ class CoinbaseSolana extends solWalletConnector.SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'CoinbaseSolana';
-        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() {
-        return this.solProviderHelper.isInstalledHelper(this.name);
+        return solProviderHelper.SolProviderHelper.isInstalledHelper(this.name);
     }
     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);
             }
             return;
         });
     }
     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/CoinbaseSolana.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 CoinbaseSolana 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/CoinbaseSolana.js

@@ -6,45 +6,42 @@ class CoinbaseSolana extends SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'CoinbaseSolana';
-        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() {
-        return this.solProviderHelper.isInstalledHelper(this.name);
+        return SolProviderHelper.isInstalledHelper(this.name);
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+                return SolProviderHelper.fetchPublicAddressWithName(this.name);
             }
             return;
         });
     }
     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/glow.cjs

@@ -8,42 +8,39 @@ class Glow extends solWalletConnector.SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'Glow';
-        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() {
-        return this.solProviderHelper.isInstalledHelper(this.name);
+        return solProviderHelper.SolProviderHelper.isInstalledHelper(this.name);
     }
     fetchPublicAddress() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+            return solProviderHelper.SolProviderHelper.fetchPublicAddressWithName(this.name);
         });
     }
     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/glow.d.ts

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

package/src/wallets/solana/glow.js

@@ -6,42 +6,39 @@ class Glow extends SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'Glow';
-        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() {
-        return this.solProviderHelper.isInstalledHelper(this.name);
+        return SolProviderHelper.isInstalledHelper(this.name);
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+            return SolProviderHelper.fetchPublicAddressWithName(this.name);
         });
     }
     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/injected/BraveSol.cjs

@@ -2,6 +2,7 @@
 
 var tslib = require('tslib');
 var phantom = require('../phantom.cjs');
+var solProviderHelper = require('../solProviderHelper.cjs');
 
 class BraveSol extends phantom {
     constructor() {
@@ -10,7 +11,7 @@ class BraveSol extends phantom {
     }
     fetchPublicAddress() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+            return solProviderHelper.SolProviderHelper.fetchPublicAddressWithName(this.name);
         });
     }
 }

package/src/wallets/solana/injected/BraveSol.js

@@ -1,5 +1,6 @@
 import { __awaiter } from 'tslib';
 import Phantom from '../phantom.js';
+import { SolProviderHelper } from '../solProviderHelper.js';
 
 class BraveSol extends Phantom {
     constructor() {
@@ -8,7 +9,7 @@ class BraveSol extends Phantom {
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+            return SolProviderHelper.fetchPublicAddressWithName(this.name);
         });
     }
 }

package/src/wallets/solana/phantom-ledger.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var web3_js = require('@solana/web3.js');
-var errors = require('../../errors.cjs');
+var utils = require('@dynamic-labs/utils');
 var extractNonce = require('../../utils/extractNonce.cjs');
 var phantom = require('./phantom.cjs');
 
@@ -30,7 +30,7 @@ class PhantomLedger extends phantom {
     }
     signMessage() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            throw new errors.NotSupportedError(`Message signing is currently not supported on ${walletName}
+            throw new utils.NotSupportedError(`Message signing is currently not supported on ${walletName}
       You can use signMessageViaTransaction instead to achieve similar functionality
       by signing a transaction with a memo instruction.
       You can read more about it here https://github.com/solana-labs/solana/issues/21366`);
@@ -40,7 +40,7 @@ class PhantomLedger extends phantom {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const nonce = extractNonce.extractNonce(messageToSign);
             if (!nonce) {
-                throw new errors.DynamicError('Nonce missing');
+                throw new utils.DynamicError('Nonce missing');
             }
             return this.signMessageViaTransaction(nonce);
         });
@@ -49,14 +49,14 @@ class PhantomLedger extends phantom {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const address = yield this.fetchPublicAddress();
             if (!address) {
-                throw new errors.DynamicError('Address missing');
+                throw new utils.DynamicError('Address missing');
             }
             const transaction = this.buildAuthTx(messageToSign);
             transaction.feePayer = new web3_js.PublicKey(address);
             transaction.recentBlockhash = (yield this.getWeb3Provider().getLatestBlockhash()).blockhash;
             const signer = yield this.getSigner();
             if (!signer) {
-                throw new errors.DynamicError('Signer not found');
+                throw new utils.DynamicError('Signer not found');
             }
             const signedTransaction = yield signer.signTransaction(transaction);
             return JSON.stringify({

package/src/wallets/solana/phantom-ledger.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import { PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js';
-import { NotSupportedError, DynamicError } from '../../errors.js';
+import { NotSupportedError, DynamicError } from '@dynamic-labs/utils';
 import { extractNonce } from '../../utils/extractNonce.js';
 import Phantom from './phantom.js';