@dynamic-labs/solana 1.1.0-alpha.10 → 1.1.0-alpha.12

package/CHANGELOG.md

@@ -1,4 +1,37 @@
 
+## [1.1.0-alpha.12](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.11...v1.1.0-alpha.12) (2024-01-18)
+
+
+### Features
+
+* expose setAuthMode method ([#4419](https://github.com/dynamic-labs/DynamicAuth/issues/4419)) ([7d156b3](https://github.com/dynamic-labs/DynamicAuth/commit/7d156b3e0eab9b9a80f70ff1c5201d90693ae755))
+
+
+### Bug Fixes
+
+* call onUnlinkSuccess in headless mode too ([#4412](https://github.com/dynamic-labs/DynamicAuth/issues/4412)) ([4c76af9](https://github.com/dynamic-labs/DynamicAuth/commit/4c76af9ac7c7b43883742d1289558dfcb5d612ca))
+* correctly map keplr chain ids from project settings ([#4418](https://github.com/dynamic-labs/DynamicAuth/issues/4418)) ([7046364](https://github.com/dynamic-labs/DynamicAuth/commit/7046364a316f7551f0b995eaae7afea13502eb9b))
+* logging in with an email linked to a third party wallet gets stuck on otp view ([#4407](https://github.com/dynamic-labs/DynamicAuth/issues/4407)) ([35bf142](https://github.com/dynamic-labs/DynamicAuth/commit/35bf142e74efeef866dbd7b8157a049cd36eeccb))
+
+## [1.1.0-alpha.11](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.10...v1.1.0-alpha.11) (2024-01-17)
+
+
+### Features
+
+* add Leather wallet and BtcKit connector ([#4335](https://github.com/dynamic-labs/DynamicAuth/issues/4335)) ([fe3316b](https://github.com/dynamic-labs/DynamicAuth/commit/fe3316b5be9ef17eea885e99cf925ccd0f271da7))
+* add solana injected wallet configuration to walletbook ([#4375](https://github.com/dynamic-labs/DynamicAuth/issues/4375)) ([3677ce5](https://github.com/dynamic-labs/DynamicAuth/commit/3677ce5ff40d0c00bfaf0daa0d5d67bc40706ee0))
+* add support for unisat wallet ([#4355](https://github.com/dynamic-labs/DynamicAuth/issues/4355)) ([5b7d6b0](https://github.com/dynamic-labs/DynamicAuth/commit/5b7d6b0a9ea84811a8252b3cdf30a3a8e410180c))
+* add walletbook configurations for solana injected wallets ([#4360](https://github.com/dynamic-labs/DynamicAuth/issues/4360)) ([cdc8e5f](https://github.com/dynamic-labs/DynamicAuth/commit/cdc8e5f4878cb84e26e5b33299aa8547b84b6667))
+* passkey renaming frontend ([#4331](https://github.com/dynamic-labs/DynamicAuth/issues/4331)) ([4551013](https://github.com/dynamic-labs/DynamicAuth/commit/4551013d577c914cb3aedfe458ab9eaa018aceb4))
+
+
+### Bug Fixes
+
+* correctly update wallets connected flag after wallet switch ([#4397](https://github.com/dynamic-labs/DynamicAuth/issues/4397)) ([543a830](https://github.com/dynamic-labs/DynamicAuth/commit/543a830574f0d5a78fedbb9b18233e8dfbaddd86))
+* export modal header ([#4401](https://github.com/dynamic-labs/DynamicAuth/issues/4401)) ([77cf016](https://github.com/dynamic-labs/DynamicAuth/commit/77cf016fc742458988864647870149a56e991ee4))
+* trigger onAuthSuccess before embedded wallet creation ([4aa341a](https://github.com/dynamic-labs/DynamicAuth/commit/4aa341a1d08332a121daddb7c2dcb09a804a4de7))
+* ui issues on react 17 ([#4373](https://github.com/dynamic-labs/DynamicAuth/issues/4373)) ([93096d6](https://github.com/dynamic-labs/DynamicAuth/commit/93096d6017816a4f0ed299bf618b130d90c81514))
+
 ## [1.1.0-alpha.10](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.9...v1.1.0-alpha.10) (2024-01-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "1.1.0-alpha.10",
+  "version": "1.1.0-alpha.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -27,11 +27,11 @@
   },
   "dependencies": {
     "@solana/web3.js": "1.70.1",
-    "@dynamic-labs/rpc-providers": "1.1.0-alpha.10",
-    "@dynamic-labs/types": "1.1.0-alpha.10",
-    "@dynamic-labs/utils": "1.1.0-alpha.10",
-    "@dynamic-labs/wallet-book": "1.1.0-alpha.10",
-    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.10",
+    "@dynamic-labs/rpc-providers": "1.1.0-alpha.12",
+    "@dynamic-labs/types": "1.1.0-alpha.12",
+    "@dynamic-labs/utils": "1.1.0-alpha.12",
+    "@dynamic-labs/wallet-book": "1.1.0-alpha.12",
+    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.12",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/CoinbaseSolana.cjs

@@ -4,43 +4,24 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var solWalletConnector = require('./solWalletConnector.cjs');
-var solProviderHelper = require('./solProviderHelper.cjs');
+var walletBook = require('@dynamic-labs/wallet-book');
+var InjectedWalletBase = require('./injected/InjectedWalletBase.cjs');
 require('@solana/web3.js');
 require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/rpc-providers');
 require('./injected/PhantomLedger.cjs');
 var isSignedMessage = require('./utils/isSignedMessage.cjs');
 
-class CoinbaseSolana extends solWalletConnector.SolWalletConnector {
-    constructor() {
-        super(...arguments);
+class CoinbaseSolana extends InjectedWalletBase.InjectedWalletBase {
+    constructor(opts) {
+        super(opts);
         this.name = 'CoinbaseSolana';
-    }
-    setupEventListeners() {
-        solProviderHelper.SolProviderHelper._setupEventListeners(this, solProviderHelper.SolProviderHelper.findProvider(this.key));
-    }
-    teardownEventListeners() {
-        solProviderHelper.SolProviderHelper._teardownEventListeners(this.key);
-    }
-    connect() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield solProviderHelper.SolProviderHelper.connectWithKey(this.key);
-        });
+        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.connectWithKey(this.key);
-        });
-    }
-    isInstalledOnBrowser() {
-        return solProviderHelper.SolProviderHelper.isInstalledHelper(this.key);
-    }
-    fetchPublicAddress() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser()) {
-                return solProviderHelper.SolProviderHelper.fetchPublicAddressWithKey(this.key);
-            }
-            return;
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     signMessage(messageToSign) {
@@ -61,11 +42,6 @@ class CoinbaseSolana extends solWalletConnector.SolWalletConnector {
             return utils.bufferToBase64(isSignedMessage.isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
-    getConnectedAccounts() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.getConnectedAccountsWithKey(this.key);
-        });
-    }
 }
 
 exports.CoinbaseSolana = CoinbaseSolana;

package/src/CoinbaseSolana.d.ts

@@ -1,13 +1,8 @@
-import { SolWalletConnector } from './solWalletConnector';
-import { ICoinbaseSolanaSigner } from './types';
-export declare class CoinbaseSolana extends SolWalletConnector {
+import { SolWalletConnectorOpts } from './solWalletConnector';
+import { InjectedWalletBase } from './injected/InjectedWalletBase';
+export declare class CoinbaseSolana extends InjectedWalletBase {
     name: string;
-    setupEventListeners(): void;
-    teardownEventListeners(): void;
-    connect(): Promise<void>;
-    getSigner(): Promise<ICoinbaseSolanaSigner | undefined>;
-    isInstalledOnBrowser(): boolean;
-    fetchPublicAddress(): Promise<string | undefined>;
+    constructor(opts: SolWalletConnectorOpts);
+    getSigner<ICoinbaseSolanaSigner>(): Promise<ICoinbaseSolanaSigner | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    getConnectedAccounts(): Promise<string[]>;
 }

package/src/CoinbaseSolana.js

@@ -1,42 +1,23 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { bufferToBase64 } from '@dynamic-labs/utils';
-import { SolWalletConnector } from './solWalletConnector.js';
-import { SolProviderHelper } from './solProviderHelper.js';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { InjectedWalletBase } from './injected/InjectedWalletBase.js';
 import '@solana/web3.js';
 import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/rpc-providers';
 import './injected/PhantomLedger.js';
 import { isSignedMessage } from './utils/isSignedMessage.js';
 
-class CoinbaseSolana extends SolWalletConnector {
-    constructor() {
-        super(...arguments);
+class CoinbaseSolana extends InjectedWalletBase {
+    constructor(opts) {
+        super(opts);
         this.name = 'CoinbaseSolana';
-    }
-    setupEventListeners() {
-        SolProviderHelper._setupEventListeners(this, SolProviderHelper.findProvider(this.key));
-    }
-    teardownEventListeners() {
-        SolProviderHelper._teardownEventListeners(this.key);
-    }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield SolProviderHelper.connectWithKey(this.key);
-        });
+        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.connectWithKey(this.key);
-        });
-    }
-    isInstalledOnBrowser() {
-        return SolProviderHelper.isInstalledHelper(this.key);
-    }
-    fetchPublicAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser()) {
-                return SolProviderHelper.fetchPublicAddressWithKey(this.key);
-            }
-            return;
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     signMessage(messageToSign) {
@@ -57,11 +38,6 @@ class CoinbaseSolana extends SolWalletConnector {
             return bufferToBase64(isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
-    getConnectedAccounts() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.getConnectedAccountsWithKey(this.key);
-        });
-    }
 }
 
 export { CoinbaseSolana };

package/src/Solflare.d.ts

@@ -1,13 +1,8 @@
-import { SolWalletConnector } from './solWalletConnector';
-import { ISolana } from './types';
-export declare class Solflare extends SolWalletConnector {
+import { InjectedWalletBase } from './injected/InjectedWalletBase';
+import { SolWalletConnectorOpts } from './solWalletConnector';
+export declare class Solflare extends InjectedWalletBase {
     name: string;
-    isInstalledOnBrowser(): boolean;
+    constructor(opts: SolWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
-    connect(): Promise<void>;
-    getSigner(): Promise<ISolana | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    getConnectedAccounts(): Promise<string[]>;
-    setupEventListeners(): void;
-    teardownEventListeners(): void;
 }

package/src/index.cjs

@@ -2,28 +2,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var CoinbaseSolana = require('./CoinbaseSolana.cjs');
-var Glow = require('./Glow.cjs');
-var Slope = require('./Slope.cjs');
-var Solflare = require('./Solflare.cjs');
-var index = require('./injected/index.cjs');
-var solWalletConnector = require('./solWalletConnector.cjs');
-var solProviderHelper = require('./solProviderHelper.cjs');
+var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
 var isSignedMessage = require('./utils/isSignedMessage.cjs');
 var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const SolanaWalletConnectors = (props) => [
-    ...index.injectedWallets,
-    CoinbaseSolana.CoinbaseSolana,
-    Glow.Glow,
-    Slope.Slope,
-    Solflare.Solflare,
+    ...fetchInjectedWalletConnectors.injectedWalletOverrides,
+    ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
 ];
 
-exports.Solflare = Solflare.Solflare;
-exports.SolWalletConnector = solWalletConnector.SolWalletConnector;
-exports.SolProviderHelper = solProviderHelper.SolProviderHelper;
 exports.isSignedMessage = isSignedMessage.isSignedMessage;
 exports.isBackpackSolanaSigner = isBackpackSolanaSigner.isBackpackSolanaSigner;
 exports.SolanaWalletConnectors = SolanaWalletConnectors;

package/src/index.d.ts

@@ -1,7 +1,4 @@
-export * from './solWalletConnector';
-export * from './solProviderHelper';
-export * from './Solflare';
-export declare const SolanaWalletConnectors: (props: any) => typeof import("./injected/BraveSol").BraveSol[];
+export declare const SolanaWalletConnectors: (props: any) => import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor[];
 export { isSignedMessage } from './utils/isSignedMessage';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner';
 export type { ISolana, IBackpackSolanaSigner, ICoinbaseSolanaSigner, SignedMessage, ISolanaSigner, } from './types';

package/src/index.js

@@ -1,21 +1,11 @@
-import { CoinbaseSolana } from './CoinbaseSolana.js';
-import { Glow } from './Glow.js';
-import { Slope } from './Slope.js';
-import { Solflare } from './Solflare.js';
-export { Solflare } from './Solflare.js';
-import { injectedWallets } from './injected/index.js';
-export { SolWalletConnector } from './solWalletConnector.js';
-export { SolProviderHelper } from './solProviderHelper.js';
+import { injectedWalletOverrides, fetchInjectedWalletConnectors } from './injected/fetchInjectedWalletConnectors.js';
 export { isSignedMessage } from './utils/isSignedMessage.js';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const SolanaWalletConnectors = (props) => [
-    ...injectedWallets,
-    CoinbaseSolana,
-    Glow,
-    Slope,
-    Solflare,
+    ...injectedWalletOverrides,
+    ...fetchInjectedWalletConnectors(props),
 ];
 
 export { SolanaWalletConnectors };

package/src/injected/BackpackSol.cjs

@@ -4,29 +4,19 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var solProviderHelper = require('../solProviderHelper.cjs');
+var walletBook = require('@dynamic-labs/wallet-book');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
 class BackpackSol extends InjectedWalletBase.InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(opts) {
+        super(opts);
         this.name = 'BackpackSol';
-    }
-    setupEventListeners() {
-        const web3Provider = solProviderHelper.SolProviderHelper.findProvider(this.key);
-        if (!web3Provider)
-            return;
-        web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('activeWalletDidChange', (publicKey) => solProviderHelper.SolProviderHelper.handleAccountChange(this, web3Provider, publicKey));
-        solProviderHelper.SolProviderHelper._setupEventListeners(this, web3Provider);
-    }
-    fetchPublicAddress() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.fetchPublicAddressWithKey(this.key);
-        });
+        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.connectWithKey(this.key);
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     signMessage(messageToSign) {
@@ -46,11 +36,6 @@ class BackpackSol extends InjectedWalletBase.InjectedWalletBase {
             return utils.bufferToBase64(signedMessage);
         });
     }
-    getConnectedAccounts() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.getConnectedAccountsWithKey(this.key);
-        });
-    }
 }
 
 exports.BackpackSol = BackpackSol;

package/src/injected/BackpackSol.d.ts

@@ -1,10 +1,8 @@
-import { IBackpackSolanaSigner } from '../types';
+import { SolWalletConnectorOpts } from '../solWalletConnector';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class BackpackSol extends InjectedWalletBase {
     name: string;
-    setupEventListeners(): void;
-    fetchPublicAddress(): Promise<string | undefined>;
-    getSigner(): Promise<IBackpackSolanaSigner | undefined>;
+    constructor(opts: SolWalletConnectorOpts);
+    getSigner<IBackpackSolanaSigner>(): Promise<IBackpackSolanaSigner | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    getConnectedAccounts(): Promise<string[]>;
 }

package/src/injected/BackpackSol.js

@@ -1,28 +1,18 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { bufferToBase64 } from '@dynamic-labs/utils';
-import { SolProviderHelper } from '../solProviderHelper.js';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 
 class BackpackSol extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(opts) {
+        super(opts);
         this.name = 'BackpackSol';
-    }
-    setupEventListeners() {
-        const web3Provider = SolProviderHelper.findProvider(this.key);
-        if (!web3Provider)
-            return;
-        web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('activeWalletDidChange', (publicKey) => SolProviderHelper.handleAccountChange(this, web3Provider, publicKey));
-        SolProviderHelper._setupEventListeners(this, web3Provider);
-    }
-    fetchPublicAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.fetchPublicAddressWithKey(this.key);
-        });
+        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.connectWithKey(this.key);
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     signMessage(messageToSign) {
@@ -42,11 +32,6 @@ class BackpackSol extends InjectedWalletBase {
             return bufferToBase64(signedMessage);
         });
     }
-    getConnectedAccounts() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.getConnectedAccountsWithKey(this.key);
-        });
-    }
 }
 
 export { BackpackSol };

package/src/injected/InjectedWalletBase.cjs

@@ -3,51 +3,55 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
-var solWalletConnector = require('../solWalletConnector.cjs');
+var walletBook = require('@dynamic-labs/wallet-book');
 var solProviderHelper = require('../solProviderHelper.cjs');
+var solWalletConnector = require('../solWalletConnector.cjs');
 
 class InjectedWalletBase extends solWalletConnector.SolWalletConnector {
+    getSolProviderHelper() {
+        if (!this.wallet) {
+            this.wallet = walletBook.getWalletBookWallet(this.walletBook, this.key);
+        }
+        if (!this.solProviderHelper) {
+            this.solProviderHelper = new solProviderHelper.SolProviderHelper(this.wallet);
+        }
+        // adding the forced typing below to avoid having to null check in other methods
+        return this.solProviderHelper;
+    }
     setupEventListeners() {
-        solProviderHelper.SolProviderHelper._setupEventListeners(this, solProviderHelper.SolProviderHelper.findProvider(this.key));
+        this.getSolProviderHelper()._setupEventListeners(this);
     }
     teardownEventListeners() {
-        solProviderHelper.SolProviderHelper._teardownEventListeners(this.key);
+        this.getSolProviderHelper()._teardownEventListeners();
     }
     connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield solProviderHelper.SolProviderHelper.connectWithKey(this.key);
+            yield this.getSolProviderHelper().connect();
         });
     }
     getSigner() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.connectWithKey(this.key);
+            return this.getSolProviderHelper().connect();
         });
     }
     isInstalledOnBrowser() {
-        var _a;
-        /**
-         * When Glow wallet is installed and Phantom isn't, isPhantom will
-         * still be true. This added check is to return false in that scenario.
-         * It relies on the fact that if both Glow and Phantom are enabled,
-         * solana.isGlow will return false.
-         */
-        return (solProviderHelper.SolProviderHelper.isInstalledHelper(this.key) && !((_a = window.solana) === null || _a === void 0 ? void 0 : _a.isGlow));
+        return this.getSolProviderHelper().isInstalledHelper();
     }
     fetchPublicAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             if (!this.isInstalledOnBrowser())
                 return;
-            return solProviderHelper.SolProviderHelper.fetchPublicAddressWithKey(this.key);
+            return this.getSolProviderHelper().fetchPublicAddress();
         });
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.signMessageWithKey(messageToSign, this.key);
+            return this.getSolProviderHelper().signMessage(messageToSign);
         });
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.getConnectedAccountsWithKey(this.key);
+            return this.getSolProviderHelper().getConnectedAccounts();
         });
     }
 }

package/src/injected/InjectedWalletBase.d.ts

@@ -1,10 +1,15 @@
-import { SolWalletConnector } from '../solWalletConnector';
+import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { ISolana } from '../types';
+import { SolProviderHelper } from '../solProviderHelper';
+import { SolWalletConnector } from '../solWalletConnector';
 export declare abstract class InjectedWalletBase extends SolWalletConnector {
+    solProviderHelper: SolProviderHelper | undefined;
+    wallet: WalletSchema | undefined;
+    getSolProviderHelper(): SolProviderHelper;
     setupEventListeners(): void;
     teardownEventListeners(): void;
     connect(): Promise<void>;
-    getSigner(): Promise<ISolana | undefined>;
+    getSigner<T = ISolana>(): Promise<T | undefined>;
     isInstalledOnBrowser(): boolean;
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;

package/src/injected/InjectedWalletBase.js

@@ -1,49 +1,53 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
-import { SolWalletConnector } from '../solWalletConnector.js';
+import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { SolProviderHelper } from '../solProviderHelper.js';
+import { SolWalletConnector } from '../solWalletConnector.js';
 
 class InjectedWalletBase extends SolWalletConnector {
+    getSolProviderHelper() {
+        if (!this.wallet) {
+            this.wallet = getWalletBookWallet(this.walletBook, this.key);
+        }
+        if (!this.solProviderHelper) {
+            this.solProviderHelper = new SolProviderHelper(this.wallet);
+        }
+        // adding the forced typing below to avoid having to null check in other methods
+        return this.solProviderHelper;
+    }
     setupEventListeners() {
-        SolProviderHelper._setupEventListeners(this, SolProviderHelper.findProvider(this.key));
+        this.getSolProviderHelper()._setupEventListeners(this);
     }
     teardownEventListeners() {
-        SolProviderHelper._teardownEventListeners(this.key);
+        this.getSolProviderHelper()._teardownEventListeners();
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield SolProviderHelper.connectWithKey(this.key);
+            yield this.getSolProviderHelper().connect();
         });
     }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.connectWithKey(this.key);
+            return this.getSolProviderHelper().connect();
         });
     }
     isInstalledOnBrowser() {
-        var _a;
-        /**
-         * When Glow wallet is installed and Phantom isn't, isPhantom will
-         * still be true. This added check is to return false in that scenario.
-         * It relies on the fact that if both Glow and Phantom are enabled,
-         * solana.isGlow will return false.
-         */
-        return (SolProviderHelper.isInstalledHelper(this.key) && !((_a = window.solana) === null || _a === void 0 ? void 0 : _a.isGlow));
+        return this.getSolProviderHelper().isInstalledHelper();
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isInstalledOnBrowser())
                 return;
-            return SolProviderHelper.fetchPublicAddressWithKey(this.key);
+            return this.getSolProviderHelper().fetchPublicAddress();
         });
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.signMessageWithKey(messageToSign, this.key);
+            return this.getSolProviderHelper().signMessage(messageToSign);
         });
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.getConnectedAccountsWithKey(this.key);
+            return this.getSolProviderHelper().getConnectedAccounts();
         });
     }
 }

package/src/injected/Phantom.cjs

@@ -4,12 +4,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
+var walletBook = require('@dynamic-labs/wallet-book');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
 class Phantom extends InjectedWalletBase.InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(opts) {
+        super(opts);
         this.name = 'Phantom';
+        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     fetchPublicAddress() {
         const _super = Object.create(null, {

package/src/injected/Phantom.d.ts

@@ -1,5 +1,7 @@
+import { SolWalletConnectorOpts } from '../solWalletConnector';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class Phantom extends InjectedWalletBase {
     name: string;
+    constructor(opts: SolWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
 }

package/src/injected/Phantom.js

@@ -1,11 +1,13 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect } from '@dynamic-labs/utils';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 
 class Phantom extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(opts) {
+        super(opts);
         this.name = 'Phantom';
+        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     fetchPublicAddress() {
         const _super = Object.create(null, {

package/src/injected/PhantomLedger.cjs

@@ -6,13 +6,14 @@ var _tslib = require('../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
 var utils = require('@dynamic-labs/utils');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var walletBook = require('@dynamic-labs/wallet-book');
 var extractNonce = require('../utils/extractNonce.cjs');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
 const MEMO_PROGRAM_ID = new web3_js.PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
 class PhantomLedger extends InjectedWalletBase.InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(opts) {
+        super(opts);
         /**
          * I'm exporting the walletName to use it for DYN-1447. As we only need the wallet name,
          * exporting it in this way, we avoid to instantiate the whole PhantomLedger class every time.
@@ -27,6 +28,7 @@ class PhantomLedger extends InjectedWalletBase.InjectedWalletBase {
             }));
             return transaction;
         };
+        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     signMessage() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {