@dynamic-labs/solana 1.1.0-alpha.1 → 1.1.0-alpha.11

package/CHANGELOG.md

@@ -1,4 +1,127 @@
 
+## [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)
+
+
+### Bug Fixes
+
+* pass flow network to magic client ([#4322](https://github.com/dynamic-labs/DynamicAuth/issues/4322)) ([f3adccf](https://github.com/dynamic-labs/DynamicAuth/commit/f3adccf9f8d835f6b04e4767acd0fbd2ac238379))
+* prevent error message when mobile wallet app is open ([#4301](https://github.com/dynamic-labs/DynamicAuth/issues/4301)) ([2a66dcf](https://github.com/dynamic-labs/DynamicAuth/commit/2a66dcfaf8100b3d910c559d35d8b731b1cb380e))
+* turnkeyWalletConnector is not an email otp connector and uses dynamic otp ([#4313](https://github.com/dynamic-labs/DynamicAuth/issues/4313)) ([e4ea56f](https://github.com/dynamic-labs/DynamicAuth/commit/e4ea56f40fdf97b3f5440b016ebd95501089cebe))
+
+## [1.1.0-alpha.9](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.8...v1.1.0-alpha.9) (2024-01-04)
+
+
+### Features
+
+* add solana magic support ([#4258](https://github.com/dynamic-labs/DynamicAuth/issues/4258)) ([da726aa](https://github.com/dynamic-labs/DynamicAuth/commit/da726aa78466c52ee3e1f18952e4351cde754cbc))
+
+
+### Bug Fixes
+
+* edge case with unlinking wallet ([#4285](https://github.com/dynamic-labs/DynamicAuth/issues/4285)) ([1057fe4](https://github.com/dynamic-labs/DynamicAuth/commit/1057fe47599381f5d9dc39ce4cbeca2041c70319))
+* remove normalizeWalletName from DynamicAuth ([5592817](https://github.com/dynamic-labs/DynamicAuth/commit/5592817b62e345319e04cca9a98276ffad87cfc2))
+* **useFetchBalance:** ensure the latest wallet balance is fetched ([#4288](https://github.com/dynamic-labs/DynamicAuth/issues/4288)) ([25dd035](https://github.com/dynamic-labs/DynamicAuth/commit/25dd035cf8893b7cd28f550026134ba0eecda142))
+
+## [1.1.0-alpha.8](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.7...v1.1.0-alpha.8) (2024-01-03)
+
+
+### Features
+
+* add new sdk view section for text ([#4280](https://github.com/dynamic-labs/DynamicAuth/issues/4280)) ([457ae38](https://github.com/dynamic-labs/DynamicAuth/commit/457ae38cd2be8dae078f40b54ffc4704299d4ed9))
+* add new setShowLinkNewWalletModal method ([f46447a](https://github.com/dynamic-labs/DynamicAuth/commit/f46447ab606f4fdbf55e5fef21dd98f8f2650e90))
+* add pk export for hd wallets ([#4266](https://github.com/dynamic-labs/DynamicAuth/issues/4266)) ([44aac69](https://github.com/dynamic-labs/DynamicAuth/commit/44aac69580ed44e66eab971f87cb6061a3fadc90))
+* add starknet support for sopelia ([#4248](https://github.com/dynamic-labs/DynamicAuth/issues/4248)) ([f9a0980](https://github.com/dynamic-labs/DynamicAuth/commit/f9a0980c3cd2d6d95c5dd17b179fbd0931f08b1a))
+* enable hardware wallet for solana wallets ([#4275](https://github.com/dynamic-labs/DynamicAuth/issues/4275)) ([704b380](https://github.com/dynamic-labs/DynamicAuth/commit/704b380186618a5a5793e88f36ccbe84b59a2e4a))
+
+
+### Bug Fixes
+
+* phantom solana not connecting on mobile ([#4284](https://github.com/dynamic-labs/DynamicAuth/issues/4284)) ([6ad75f1](https://github.com/dynamic-labs/DynamicAuth/commit/6ad75f152896459f5cf658227f998c246b6a572b))
+* use bitcoin payment address for onramp ([#4273](https://github.com/dynamic-labs/DynamicAuth/issues/4273)) ([a2f54e8](https://github.com/dynamic-labs/DynamicAuth/commit/a2f54e812a11a91ee488eca64f14b5eeea1a8874))
+
+## [1.1.0-alpha.7](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.6...v1.1.0-alpha.7) (2023-12-28)
+
+
+### Features
+
+* better coinbase deeplinking ux ([#4164](https://github.com/dynamic-labs/DynamicAuth/issues/4164)) ([5252608](https://github.com/dynamic-labs/DynamicAuth/commit/525260851900a33a52f129def338963400344205))
+
+
+### Bug Fixes
+
+* don't prompt for connect when selecting bitcoin wallet if already connected ([#4265](https://github.com/dynamic-labs/DynamicAuth/issues/4265)) ([adef402](https://github.com/dynamic-labs/DynamicAuth/commit/adef402ef94270a17fab896a8585a7f2eacd3681))
+
+## [1.1.0-alpha.6](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.5...v1.1.0-alpha.6) (2023-12-27)
+
+
+### Features
+
+* add multi-wallet-prompts-widget ([#4166](https://github.com/dynamic-labs/DynamicAuth/issues/4166)) ([151e3d2](https://github.com/dynamic-labs/DynamicAuth/commit/151e3d2e7bebbf18448e4af8eecbf660f713cd3d))
+
+
+### Bug Fixes
+
+* coinbase solana signMessage ([#4254](https://github.com/dynamic-labs/DynamicAuth/issues/4254)) ([f0300a9](https://github.com/dynamic-labs/DynamicAuth/commit/f0300a93ed6c9ba9dfab613820d8cedbe72abb87))
+* make useConnectWithEmailOtp work cross views ([#4252](https://github.com/dynamic-labs/DynamicAuth/issues/4252)) ([a097119](https://github.com/dynamic-labs/DynamicAuth/commit/a097119556c38a22f338a783f79d512b99203cf5))
+
+## [1.1.0-alpha.5](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.4...v1.1.0-alpha.5) (2023-12-21)
+
+
+### Features
+
+* add support for xverse wallet ([#4245](https://github.com/dynamic-labs/DynamicAuth/issues/4245)) ([7b68546](https://github.com/dynamic-labs/DynamicAuth/commit/7b6854684412007bcb33896555900936395176df))
+* **gvty-526:** add embedded reveal ([#4233](https://github.com/dynamic-labs/DynamicAuth/issues/4233)) ([c2d0f90](https://github.com/dynamic-labs/DynamicAuth/commit/c2d0f903f4a4646f86c71834540fd49d51a4a7ae))
+
+## [1.1.0-alpha.4](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.3...v1.1.0-alpha.4) (2023-12-21)
+
+
+### Features
+
+* add bitcoin integration ([#4216](https://github.com/dynamic-labs/DynamicAuth/issues/4216)) ([9584f1c](https://github.com/dynamic-labs/DynamicAuth/commit/9584f1cc3133835049ad1c53da980192263b8f21))
+* add default footer to wallet list when tos and pp not enabled ([#4224](https://github.com/dynamic-labs/DynamicAuth/issues/4224)) ([0ad81c4](https://github.com/dynamic-labs/DynamicAuth/commit/0ad81c409bcb4aafb0dc565685525d620a95efce))
+* adds useConnectWithEmailOtp ([#4234](https://github.com/dynamic-labs/DynamicAuth/issues/4234)) ([4a4e50a](https://github.com/dynamic-labs/DynamicAuth/commit/4a4e50ac8651c2a249d5125ae6bcf49aaf49be8c))
+
+## [1.1.0-alpha.3](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.2...v1.1.0-alpha.3) (2023-12-19)
+
+
+### Features
+
+* add Flow support in magic wallet connector  ([#4158](https://github.com/dynamic-labs/DynamicAuth/issues/4158)) ([fbbaea7](https://github.com/dynamic-labs/DynamicAuth/commit/fbbaea76b36ceb693f6bd4f2404dfa1204e61492))
+* add showDynamicUserProfile to DynamicContext ([#4214](https://github.com/dynamic-labs/DynamicAuth/issues/4214)) ([2aeb8e3](https://github.com/dynamic-labs/DynamicAuth/commit/2aeb8e3c45a3d9f87bd9196ea9b46927e02eb633))
+
+
+### Bug Fixes
+
+* add shortname to braveevm to allow for lookups by name as well as key ([#4213](https://github.com/dynamic-labs/DynamicAuth/issues/4213)) ([969b089](https://github.com/dynamic-labs/DynamicAuth/commit/969b089be516fb57fcdc941f908c078998eb4ec0))
+* solflare connect ([#4215](https://github.com/dynamic-labs/DynamicAuth/issues/4215)) ([9a4164e](https://github.com/dynamic-labs/DynamicAuth/commit/9a4164e53198f33ef7201cd4e1eff745a09e9701))
+* wagmi attempt to connect to primary wallet first ([#4206](https://github.com/dynamic-labs/DynamicAuth/issues/4206)) ([9e5fc8e](https://github.com/dynamic-labs/DynamicAuth/commit/9e5fc8ef026628935ac32d3bb0c22bda35057e5d))
+
+## [1.1.0-alpha.2](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.1...v1.1.0-alpha.2) (2023-12-18)
+
+
+### Bug Fixes
+
+* increase timeout when fetching wallet network ([#4197](https://github.com/dynamic-labs/DynamicAuth/issues/4197)) ([bd43d45](https://github.com/dynamic-labs/DynamicAuth/commit/bd43d452dccf36f68bd012e5737480599b93c3b5))
+
 ## [1.1.0-alpha.1](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.0...v1.1.0-alpha.1) (2023-12-15)
 
 ## [1.1.0-alpha.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.0.0-alpha.14...v1.1.0-alpha.0) (2023-12-12)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "1.1.0-alpha.1",
+  "version": "1.1.0-alpha.11",
   "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.1",
-    "@dynamic-labs/types": "1.1.0-alpha.1",
-    "@dynamic-labs/utils": "1.1.0-alpha.1",
-    "@dynamic-labs/wallet-book": "1.1.0-alpha.1",
-    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.1",
+    "@dynamic-labs/rpc-providers": "1.1.0-alpha.11",
+    "@dynamic-labs/types": "1.1.0-alpha.11",
+    "@dynamic-labs/utils": "1.1.0-alpha.11",
+    "@dynamic-labs/wallet-book": "1.1.0-alpha.11",
+    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.11",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/CoinbaseSolana.cjs

@@ -3,49 +3,43 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
-var solWalletConnector = require('./solWalletConnector.cjs');
-var solProviderHelper = require('./solProviderHelper.cjs');
+var utils = require('@dynamic-labs/utils');
+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.name));
-    }
-    teardownEventListeners() {
-        solProviderHelper.SolProviderHelper._teardownEventListeners(this.name);
-    }
-    connect() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield solProviderHelper.SolProviderHelper.connectWithName(this.name);
-        });
+        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.connectWithName(this.name);
-        });
-    }
-    isInstalledOnBrowser() {
-        return solProviderHelper.SolProviderHelper.isInstalledHelper(this.name);
-    }
-    fetchPublicAddress() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser()) {
-                return solProviderHelper.SolProviderHelper.fetchPublicAddressWithName(this.name);
-            }
-            return;
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.signMessageWithName(messageToSign, this.name);
-        });
-    }
-    getConnectedAccounts() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.getConnectedAccountsWithName(this.name);
+            const walletAddress = yield this.fetchPublicAddress();
+            if (!walletAddress) {
+                return undefined;
+            }
+            const provider = yield this.getSigner();
+            if (!provider) {
+                return undefined;
+            }
+            const encodedMessage = new TextEncoder().encode(messageToSign);
+            const signedMessage = yield provider.signMessage(encodedMessage, walletAddress);
+            if (!signedMessage) {
+                return undefined;
+            }
+            return utils.bufferToBase64(isSignedMessage.isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
 }

package/src/CoinbaseSolana.d.ts

@@ -1,13 +1,8 @@
-import { SolWalletConnector } from './solWalletConnector';
-import { ISolana } 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<ISolana | 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,47 +1,41 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { SolWalletConnector } from './solWalletConnector.js';
-import { SolProviderHelper } from './solProviderHelper.js';
+import { bufferToBase64 } from '@dynamic-labs/utils';
+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.name));
-    }
-    teardownEventListeners() {
-        SolProviderHelper._teardownEventListeners(this.name);
-    }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield SolProviderHelper.connectWithName(this.name);
-        });
+        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.connectWithName(this.name);
-        });
-    }
-    isInstalledOnBrowser() {
-        return SolProviderHelper.isInstalledHelper(this.name);
-    }
-    fetchPublicAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser()) {
-                return SolProviderHelper.fetchPublicAddressWithName(this.name);
-            }
-            return;
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.signMessageWithName(messageToSign, this.name);
-        });
-    }
-    getConnectedAccounts() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.getConnectedAccountsWithName(this.name);
+            const walletAddress = yield this.fetchPublicAddress();
+            if (!walletAddress) {
+                return undefined;
+            }
+            const provider = yield this.getSigner();
+            if (!provider) {
+                return undefined;
+            }
+            const encodedMessage = new TextEncoder().encode(messageToSign);
+            const signedMessage = yield provider.signMessage(encodedMessage, walletAddress);
+            if (!signedMessage) {
+                return undefined;
+            }
+            return bufferToBase64(isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
 }

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, SignedMessage, ISolanaSigner, } from './types';
+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.name);
-        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.fetchPublicAddressWithName(this.name);
-        });
+        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.connectWithName(this.name);
+            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.getConnectedAccountsWithName(this.name);
-        });
-    }
 }
 
 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.name);
-        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.fetchPublicAddressWithName(this.name);
-        });
+        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.connectWithName(this.name);
+            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.getConnectedAccountsWithName(this.name);
-        });
-    }
 }
 
 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.name));
+        this.getSolProviderHelper()._setupEventListeners(this);
     }
     teardownEventListeners() {
-        solProviderHelper.SolProviderHelper._teardownEventListeners(this.name);
+        this.getSolProviderHelper()._teardownEventListeners();
     }
     connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield solProviderHelper.SolProviderHelper.connectWithName(this.name);
+            yield this.getSolProviderHelper().connect();
         });
     }
     getSigner() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.connectWithName(this.name);
+            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.name) && !((_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.fetchPublicAddressWithName(this.name);
+            return this.getSolProviderHelper().fetchPublicAddress();
         });
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.signMessageWithName(messageToSign, this.name);
+            return this.getSolProviderHelper().signMessage(messageToSign);
         });
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.getConnectedAccountsWithName(this.name);
+            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>;