@dynamic-labs/solana 4.40.1 → 4.40.2

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [4.40.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.40.1...v4.40.2) (2025-10-28)
+
+
+### Bug Fixes
+
+* upgrade node to 20.20 in sanity-yarn-add-sdk job for compatibility ([#9743](https://github.com/dynamic-labs/dynamic-auth/issues/9743)) ([58d7e32](https://github.com/dynamic-labs/dynamic-auth/commit/58d7e32cd3965fba983c91c6345eae3bfe8dd1d5))
+
 ### [4.40.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.40.0...v4.40.1) (2025-10-24)
 
 ### Bug Fixes

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.40.1";
+var version = "4.40.2";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.40.1";
+var version = "4.40.2";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "4.40.1",
+  "version": "4.40.2",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -18,7 +18,7 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/wallet-connect": "4.40.1",
+    "@dynamic-labs/wallet-connect": "4.40.2",
     "@solana/web3.js": "1.98.1",
     "@wallet-standard/app": "1.0.1",
     "@wallet-standard/base": "1.0.1",
@@ -29,17 +29,17 @@
     "@walletconnect/sign-client": "2.21.5",
     "@walletconnect/utils": "2.21.5",
     "@walletconnect/types": "2.21.5",
-    "@dynamic-labs/assert-package-version": "4.40.1",
-    "@dynamic-labs/embedded-wallet-solana": "4.40.1",
-    "@dynamic-labs/logger": "4.40.1",
-    "@dynamic-labs/rpc-providers": "4.40.1",
+    "@dynamic-labs/assert-package-version": "4.40.2",
+    "@dynamic-labs/embedded-wallet-solana": "4.40.2",
+    "@dynamic-labs/logger": "4.40.2",
+    "@dynamic-labs/rpc-providers": "4.40.2",
     "@dynamic-labs/sdk-api-core": "0.0.813",
-    "@dynamic-labs/solana-core": "4.40.1",
-    "@dynamic-labs/types": "4.40.1",
-    "@dynamic-labs/utils": "4.40.1",
-    "@dynamic-labs/waas-svm": "4.40.1",
-    "@dynamic-labs/wallet-book": "4.40.1",
-    "@dynamic-labs/wallet-connector-core": "4.40.1",
+    "@dynamic-labs/solana-core": "4.40.2",
+    "@dynamic-labs/types": "4.40.2",
+    "@dynamic-labs/utils": "4.40.2",
+    "@dynamic-labs/waas-svm": "4.40.2",
+    "@dynamic-labs/wallet-book": "4.40.2",
+    "@dynamic-labs/wallet-connector-core": "4.40.2",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/Solflare/Solflare.cjs

@@ -5,13 +5,15 @@ 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('../injected/InjectedWalletBase/InjectedWalletBase.cjs');
 
 class Solflare extends InjectedWalletBase.InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(props) {
+        super(props);
         this.name = 'Solflare';
         this.overrideKey = 'solflare';
+        this.walletConnectWalletBookEntry = walletBook.findWalletBookWallet(props.walletBook, this.key);
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/Solflare/Solflare.d.ts

@@ -1,7 +1,9 @@
+import { SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from '../injected/InjectedWalletBase';
 export declare class Solflare extends InjectedWalletBase {
     name: string;
     overrideKey: string;
+    constructor(props: SolanaWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
 }

package/src/Solflare/Solflare.js

@@ -1,13 +1,15 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect, bufferToBase64 } from '@dynamic-labs/utils';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { InjectedWalletBase } from '../injected/InjectedWalletBase/InjectedWalletBase.js';
 
 class Solflare extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(props) {
+        super(props);
         this.name = 'Solflare';
         this.overrideKey = 'solflare';
+        this.walletConnectWalletBookEntry = findWalletBookWallet(props.walletBook, this.key);
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {

package/src/index.cjs

@@ -12,7 +12,6 @@ var SolanaWalletConnectors = require('./SolanaWalletConnectors.cjs');
 var SolanaWalletConnectorsWithConfig = require('./SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.cjs');
 var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
 var isSignedMessage = require('./utils/isSignedMessage.cjs');
-require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/utils');
 require('./CoinbaseSolana/CoinbaseSolana.cjs');

package/src/index.js

@@ -8,7 +8,6 @@ export { SolanaWalletConnectors } from './SolanaWalletConnectors.js';
 export { SolanaWalletConnectorsWithConfig } from './SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.js';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';
 export { isSignedMessage } from './utils/isSignedMessage.js';
-import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/utils';
 import './CoinbaseSolana/CoinbaseSolana.js';

package/src/injected/BackpackSol/BackpackSol.cjs

@@ -5,13 +5,15 @@ 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/InjectedWalletBase.cjs');
 
 class BackpackSol extends InjectedWalletBase.InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(props) {
+        super(props);
         this.name = 'Backpack';
         this.overrideKey = 'backpacksol';
+        this.walletConnectWalletBookEntry = walletBook.findWalletBookWallet(props.walletBook, this.key);
     }
     getSigner() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/injected/BackpackSol/BackpackSol.d.ts

@@ -1,7 +1,9 @@
+import { SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from '../InjectedWalletBase';
 export declare class BackpackSol extends InjectedWalletBase {
     name: string;
     overrideKey: string;
+    constructor(props: SolanaWalletConnectorOpts);
     getSigner<IBackpackSolanaSigner>(): Promise<IBackpackSolanaSigner | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
 }

package/src/injected/BackpackSol/BackpackSol.js

@@ -1,13 +1,15 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { bufferToBase64 } from '@dynamic-labs/utils';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { InjectedWalletBase } from '../InjectedWalletBase/InjectedWalletBase.js';
 
 class BackpackSol extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(props) {
+        super(props);
         this.name = 'Backpack';
         this.overrideKey = 'backpacksol';
+        this.walletConnectWalletBookEntry = findWalletBookWallet(props.walletBook, this.key);
     }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {

package/src/injected/InjectedWalletBase/InjectedWalletBase.cjs

@@ -36,10 +36,7 @@ class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
             return this;
         }
         // if the wallet is not installed on the browser and WC is available, return the WC connector
-        const wcConnector = new SolanaWalletConnectConnector.SolanaWalletConnectConnector(Object.assign(Object.assign({}, this.constructorProps), { metadata: walletConnectorCore.getWalletMetadataFromWalletBook({
-                walletBookWallet: this.walletConnectWalletBookEntry,
-                walletKey: this.key,
-            }), overrideKey: this.key, walletName: this.name }));
+        const wcConnector = new SolanaWalletConnectConnector.SolanaWalletConnectConnector(Object.assign(Object.assign({}, this.constructorProps), { metadata: walletConnectorCore.getWalletMetadataFromWalletBook(Object.assign(Object.assign({}, this.metadata), { walletBookWallet: this.walletConnectWalletBookEntry, walletKey: this.key })), overrideKey: this.key, walletName: this.name }));
         wcConnector.init();
         return wcConnector;
     }

package/src/injected/InjectedWalletBase/InjectedWalletBase.js

@@ -32,10 +32,7 @@ class InjectedWalletBase extends SolanaWalletConnector {
             return this;
         }
         // if the wallet is not installed on the browser and WC is available, return the WC connector
-        const wcConnector = new SolanaWalletConnectConnector(Object.assign(Object.assign({}, this.constructorProps), { metadata: getWalletMetadataFromWalletBook({
-                walletBookWallet: this.walletConnectWalletBookEntry,
-                walletKey: this.key,
-            }), overrideKey: this.key, walletName: this.name }));
+        const wcConnector = new SolanaWalletConnectConnector(Object.assign(Object.assign({}, this.constructorProps), { metadata: getWalletMetadataFromWalletBook(Object.assign(Object.assign({}, this.metadata), { walletBookWallet: this.walletConnectWalletBookEntry, walletKey: this.key })), overrideKey: this.key, walletName: this.name }));
         wcConnector.init();
         return wcConnector;
     }

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var walletBook = require('@dynamic-labs/wallet-book');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 var CoinbaseSolana = require('../CoinbaseSolana/CoinbaseSolana.cjs');
@@ -53,9 +52,9 @@ const shouldAddWalletStandardConnector = (wallet, walletBook, authMode) => {
     });
     return !shouldHandleFromWalletBook && hasAllFeatures;
 };
-const fetchInjectedWalletConnectors = ({ walletBook: walletBook$1, authMode, }) => {
+const fetchInjectedWalletConnectors = ({ walletBook, authMode, }) => {
     var _a;
-    const walletBookConnectors = Object.entries((_a = walletBook$1 === null || walletBook$1 === void 0 ? void 0 : walletBook$1.wallets) !== null && _a !== void 0 ? _a : {})
+    const walletBookConnectors = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
         .filter(([key, wallet]) => {
         var _a, _b, _c;
         const injectedConfig = (_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'sol');
@@ -66,21 +65,26 @@ const fetchInjectedWalletConnectors = ({ walletBook: walletBook$1, authMode, })
             ((_c = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.features) === null || _c === void 0 ? void 0 : _c.length);
         return isSolanaWallet && !shouldBeFiltered;
     })
-        .map(([key, wallet]) => getConnectorConstructorInjectedWallet.getConnectorConstructorInjectedWallet({ key, wallet, walletBook: walletBook$1 }));
+        .map(([key, wallet]) => getConnectorConstructorInjectedWallet.getConnectorConstructorInjectedWallet({ key, wallet, walletBook }));
     const walletStandardWallets = getWalletStandardWallets.getWalletStandardWallets();
     const walletStandardConnectors = walletStandardWallets
-        .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook$1, authMode))
+        .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook, authMode))
         .map((wallet) => {
-        const walletBookWallet = walletBook.findWalletBookWalletByNameAndChain(walletBook$1, wallet.name, 'sol');
+        var _a, _b;
+        const [walletBookKey, walletBookWallet] = (_b = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).find(([, walletBookEntry]) => {
+            var _a, _b;
+            return walletBookEntry.name === wallet.name &&
+                ((_b = (_a = walletBookEntry.injectedConfig) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.chain) === 'sol';
+        })) !== null && _b !== void 0 ? _b : [];
         // if the wallet book wallet is found, we want to use it to get the metadata
         // to merge with the wallet standard metadata, specially the supportedHardwareWallets prop
         const walletBookMetadata = walletBookWallet &&
             walletConnectorCore.getWalletMetadataFromWalletBook({
-                walletBook: walletBook$1,
+                walletBook,
                 walletBookWallet,
-                walletKey: `sanitizeName(${wallet.name})sol`,
+                walletKey: walletBookKey !== null && walletBookKey !== void 0 ? walletBookKey : `${utils.sanitizeName(wallet.name)}sol`,
             });
-        return getConnectorConstructorForWalletStandardWallet.getConnectorConstructorForWalletStandardWallet(wallet, walletBookMetadata);
+        return getConnectorConstructorForWalletStandardWallet.getConnectorConstructorForWalletStandardWallet(wallet, walletBookMetadata, walletBookKey);
     });
     logger.logger.logVerboseTroubleshootingMessage('[SOL fetchInjectedWalletConnectors] walletStandardConnectors', walletStandardConnectors.map((w) => w.name));
     return [...walletBookConnectors, ...walletStandardConnectors];

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,5 +1,4 @@
 'use client'
-import { findWalletBookWalletByNameAndChain } from '@dynamic-labs/wallet-book';
 import { getWalletMetadataFromWalletBook } from '@dynamic-labs/wallet-connector-core';
 import { sanitizeName } from '@dynamic-labs/utils';
 import { CoinbaseSolana } from '../CoinbaseSolana/CoinbaseSolana.js';
@@ -67,16 +66,21 @@ const fetchInjectedWalletConnectors = ({ walletBook, authMode, }) => {
     const walletStandardConnectors = walletStandardWallets
         .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook, authMode))
         .map((wallet) => {
-        const walletBookWallet = findWalletBookWalletByNameAndChain(walletBook, wallet.name, 'sol');
+        var _a, _b;
+        const [walletBookKey, walletBookWallet] = (_b = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).find(([, walletBookEntry]) => {
+            var _a, _b;
+            return walletBookEntry.name === wallet.name &&
+                ((_b = (_a = walletBookEntry.injectedConfig) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.chain) === 'sol';
+        })) !== null && _b !== void 0 ? _b : [];
         // if the wallet book wallet is found, we want to use it to get the metadata
         // to merge with the wallet standard metadata, specially the supportedHardwareWallets prop
         const walletBookMetadata = walletBookWallet &&
             getWalletMetadataFromWalletBook({
                 walletBook,
                 walletBookWallet,
-                walletKey: `sanitizeName(${wallet.name})sol`,
+                walletKey: walletBookKey !== null && walletBookKey !== void 0 ? walletBookKey : `${sanitizeName(wallet.name)}sol`,
             });
-        return getConnectorConstructorForWalletStandardWallet(wallet, walletBookMetadata);
+        return getConnectorConstructorForWalletStandardWallet(wallet, walletBookMetadata, walletBookKey);
     });
     logger.logVerboseTroubleshootingMessage('[SOL fetchInjectedWalletConnectors] walletStandardConnectors', walletStandardConnectors.map((w) => w.name));
     return [...walletBookConnectors, ...walletStandardConnectors];

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.cjs

@@ -7,9 +7,9 @@ var utils = require('@dynamic-labs/utils');
 var InjectedWalletBase = require('../../InjectedWalletBase/InjectedWalletBase.cjs');
 var createSolanaSignerFromWalletStandard = require('../createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.cjs');
 
-const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetadata = {}) => {
+const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetadata = {}, walletBookKey = undefined) => {
     const sanitizedName = utils.sanitizeName(wallet.name);
-    return class extends InjectedWalletBase.InjectedWalletBase {
+    const ConnectorConstructor = class extends InjectedWalletBase.InjectedWalletBase {
         constructor(props) {
             super(Object.assign(Object.assign({}, props), { metadata: Object.assign(Object.assign({}, walletBookMetadata), { groupKey: sanitizedName, icon: wallet.icon, id: sanitizedName, name: wallet.name }) }));
             this.name = wallet.name;
@@ -23,6 +23,11 @@ const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetada
             return this._provider;
         }
     };
+    Object.defineProperty(ConnectorConstructor, 'key', {
+        value: walletBookKey !== null && walletBookKey !== void 0 ? walletBookKey : sanitizedName,
+        writable: false,
+    });
+    return ConnectorConstructor;
 };
 
 exports.getConnectorConstructorForWalletStandardWallet = getConnectorConstructorForWalletStandardWallet;

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.d.ts

@@ -1,3 +1,3 @@
 import { Wallet } from '@wallet-standard/base';
 import { WalletConnectorConstructor, WalletMetadata } from '@dynamic-labs/wallet-connector-core';
-export declare const getConnectorConstructorForWalletStandardWallet: (wallet: Wallet, walletBookMetadata?: Partial<WalletMetadata>) => WalletConnectorConstructor;
+export declare const getConnectorConstructorForWalletStandardWallet: (wallet: Wallet, walletBookMetadata?: Partial<WalletMetadata>, walletBookKey?: string | undefined) => WalletConnectorConstructor;

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.js

@@ -3,9 +3,9 @@ import { sanitizeName } from '@dynamic-labs/utils';
 import { InjectedWalletBase } from '../../InjectedWalletBase/InjectedWalletBase.js';
 import { createSolanaSignerFromWalletStandard } from '../createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.js';
 
-const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetadata = {}) => {
+const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetadata = {}, walletBookKey = undefined) => {
     const sanitizedName = sanitizeName(wallet.name);
-    return class extends InjectedWalletBase {
+    const ConnectorConstructor = class extends InjectedWalletBase {
         constructor(props) {
             super(Object.assign(Object.assign({}, props), { metadata: Object.assign(Object.assign({}, walletBookMetadata), { groupKey: sanitizedName, icon: wallet.icon, id: sanitizedName, name: wallet.name }) }));
             this.name = wallet.name;
@@ -19,6 +19,11 @@ const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetada
             return this._provider;
         }
     };
+    Object.defineProperty(ConnectorConstructor, 'key', {
+        value: walletBookKey !== null && walletBookKey !== void 0 ? walletBookKey : sanitizedName,
+        writable: false,
+    });
+    return ConnectorConstructor;
 };
 
 export { getConnectorConstructorForWalletStandardWallet };

package/src/walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.cjs

@@ -189,6 +189,9 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
             logger.logger.debug('[SolanaWalletConnect] getAddress', opts);
+            if (this.session) {
+                return this.getActiveAddress();
+            }
             /**
              * In mobile/Safari, if the user just navigates back after the deeplink prompt the connection
              * is not rejected, so the previous connection URI is still valid and we can use it to handle the connection
@@ -198,10 +201,6 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
                 this.displayUri(opts);
                 return;
             }
-            /**
-             * If we are already connected to a session, we need to end it first
-             */
-            yield this.endSession();
             logger.logger.logVerboseTroubleshootingMessage('[WalletConnectConnector] getAddress', {
                 inAppBrowserUrl: (_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl,
                 isMobile: utils.isMobile(),

package/src/walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.js

@@ -180,6 +180,9 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             logger.debug('[SolanaWalletConnect] getAddress', opts);
+            if (this.session) {
+                return this.getActiveAddress();
+            }
             /**
              * In mobile/Safari, if the user just navigates back after the deeplink prompt the connection
              * is not rejected, so the previous connection URI is still valid and we can use it to handle the connection
@@ -189,10 +192,6 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
                 this.displayUri(opts);
                 return;
             }
-            /**
-             * If we are already connected to a session, we need to end it first
-             */
-            yield this.endSession();
             logger.logVerboseTroubleshootingMessage('[WalletConnectConnector] getAddress', {
                 inAppBrowserUrl: (_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl,
                 isMobile: isMobile(),