@dynamic-labs/solana 4.0.0-alpha.45 → 4.0.0-alpha.46

package/CHANGELOG.md

@@ -1,4 +1,17 @@
 
+## [4.0.0-alpha.46](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.45...v4.0.0-alpha.46) (2024-12-17)
+
+
+### Features
+
+* **GVTY-2484:** add subdomain handle field ([#7613](https://github.com/dynamic-labs/dynamic-auth/issues/7613)) ([ee8df3b](https://github.com/dynamic-labs/dynamic-auth/commit/ee8df3b34fa9fed96d92d0b414334c370c9791bc))
+
+
+### Bug Fixes
+
+* increase wait for transactions ([#7624](https://github.com/dynamic-labs/dynamic-auth/issues/7624)) ([2f7f01b](https://github.com/dynamic-labs/dynamic-auth/commit/2f7f01b024c2733f71ea0fd09dff24f815120acb))
+* solana wallet standard signer connect ([#7614](https://github.com/dynamic-labs/dynamic-auth/issues/7614)) ([1836cf3](https://github.com/dynamic-labs/dynamic-auth/commit/1836cf343b45bae01cfdcf0c0d010bf38bf54d83))
+
 ## [4.0.0-alpha.45](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.44...v4.0.0-alpha.45) (2024-12-11)
 
 

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.0.0-alpha.45";
+var version = "4.0.0-alpha.46";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "4.0.0-alpha.45",
+  "version": "4.0.0-alpha.46",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -25,16 +25,16 @@
     "@wallet-standard/experimental-features": "0.1.1",
     "bs58": "5.0.0",
     "tweetnacl": "1.0.3",
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.45",
-    "@dynamic-labs/embedded-wallet-solana": "4.0.0-alpha.45",
-    "@dynamic-labs/logger": "4.0.0-alpha.45",
-    "@dynamic-labs/rpc-providers": "4.0.0-alpha.45",
-    "@dynamic-labs/sdk-api-core": "0.0.570",
-    "@dynamic-labs/solana-core": "4.0.0-alpha.45",
-    "@dynamic-labs/types": "4.0.0-alpha.45",
-    "@dynamic-labs/utils": "4.0.0-alpha.45",
-    "@dynamic-labs/wallet-book": "4.0.0-alpha.45",
-    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.45"
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.46",
+    "@dynamic-labs/embedded-wallet-solana": "4.0.0-alpha.46",
+    "@dynamic-labs/logger": "4.0.0-alpha.46",
+    "@dynamic-labs/rpc-providers": "4.0.0-alpha.46",
+    "@dynamic-labs/sdk-api-core": "0.0.576",
+    "@dynamic-labs/solana-core": "4.0.0-alpha.46",
+    "@dynamic-labs/types": "4.0.0-alpha.46",
+    "@dynamic-labs/utils": "4.0.0-alpha.46",
+    "@dynamic-labs/wallet-book": "4.0.0-alpha.46",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.46"
   },
   "peerDependencies": {}
 }

package/src/CoinbaseSolana/CoinbaseSolana.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var InjectedWalletBase = require('../injected/InjectedWalletBase.cjs');
+var InjectedWalletBase = require('../injected/InjectedWalletBase/InjectedWalletBase.cjs');
 var isSignedMessage = require('../utils/isSignedMessage.cjs');
 
 class CoinbaseSolana extends InjectedWalletBase.InjectedWalletBase {

package/src/CoinbaseSolana/CoinbaseSolana.js

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { bufferToBase64 } from '@dynamic-labs/utils';
-import { InjectedWalletBase } from '../injected/InjectedWalletBase.js';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase/InjectedWalletBase.js';
 import { isSignedMessage } from '../utils/isSignedMessage.js';
 
 class CoinbaseSolana extends InjectedWalletBase {

package/src/Phantom/Phantom.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../_virtual/_tslib.cjs');
 var solanaCore = require('@dynamic-labs/solana-core');
 var utils = require('@dynamic-labs/utils');
-var PhantomInjected = require('../injected/PhantomInjected.cjs');
+var PhantomInjected = require('../injected/PhantomInjected/PhantomInjected.cjs');
 var PhantomRedirect = require('../phantomRedirect/PhantomRedirect/PhantomRedirect.cjs');
 
 class Phantom extends solanaCore.SolanaWalletConnector {

package/src/Phantom/Phantom.js

@@ -2,7 +2,7 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { SolanaWalletConnector } from '@dynamic-labs/solana-core';
 import { isMobile } from '@dynamic-labs/utils';
-import { PhantomInjected } from '../injected/PhantomInjected.js';
+import { PhantomInjected } from '../injected/PhantomInjected/PhantomInjected.js';
 import { PhantomRedirect } from '../phantomRedirect/PhantomRedirect/PhantomRedirect.js';
 
 class Phantom extends SolanaWalletConnector {

package/src/SolProviderHelper/SolProviderHelper.cjs

@@ -7,7 +7,7 @@ var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 var walletBook = require('@dynamic-labs/wallet-book');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var findWalletProviderFromWalletStandard = require('../utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.cjs');
+var findWalletProviderFromWalletStandard = require('../injected/walletStandard/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.cjs');
 var isSignedMessage = require('../utils/isSignedMessage.cjs');
 
 class SolProviderHelper {
@@ -173,13 +173,23 @@ class SolProviderHelper {
                 return [];
             }
             const address = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address;
-            const publicKey = (_a = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _a !== void 0 ? _a : (_b = provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString();
-            if (address)
+            if (address) {
                 return [address];
-            else if (publicKey)
-                return [publicKey === null || publicKey === void 0 ? void 0 : publicKey.toString()];
-            else
-                return [];
+            }
+            // adding a try/catch to prevent errors from being thrown
+            // when the public key getter throws for wallet standard wallets
+            try {
+                const publicKey = (_a = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _a !== void 0 ? _a : (_b = provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString();
+                if (publicKey)
+                    return [publicKey === null || publicKey === void 0 ? void 0 : publicKey.toString()];
+            }
+            catch (e) {
+                walletConnectorCore.logger.debug('Error getting public key', {
+                    connector: this.connector,
+                    error: e,
+                });
+            }
+            return [];
         });
     }
 }

package/src/SolProviderHelper/SolProviderHelper.js

@@ -3,7 +3,7 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import { getProvidersFromWindow, bufferToBase64 } from '@dynamic-labs/utils';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { ProviderLookup, logger } from '@dynamic-labs/wallet-connector-core';
-import { findWalletProviderFromWalletStandard } from '../utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.js';
+import { findWalletProviderFromWalletStandard } from '../injected/walletStandard/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.js';
 import { isSignedMessage } from '../utils/isSignedMessage.js';
 
 class SolProviderHelper {
@@ -169,13 +169,23 @@ class SolProviderHelper {
                 return [];
             }
             const address = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address;
-            const publicKey = (_a = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _a !== void 0 ? _a : (_b = provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString();
-            if (address)
+            if (address) {
                 return [address];
-            else if (publicKey)
-                return [publicKey === null || publicKey === void 0 ? void 0 : publicKey.toString()];
-            else
-                return [];
+            }
+            // adding a try/catch to prevent errors from being thrown
+            // when the public key getter throws for wallet standard wallets
+            try {
+                const publicKey = (_a = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _a !== void 0 ? _a : (_b = provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString();
+                if (publicKey)
+                    return [publicKey === null || publicKey === void 0 ? void 0 : publicKey.toString()];
+            }
+            catch (e) {
+                logger.debug('Error getting public key', {
+                    connector: this.connector,
+                    error: e,
+                });
+            }
+            return [];
         });
     }
 }

package/src/SolanaWalletConnectors.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var embeddedWalletSolana = require('@dynamic-labs/embedded-wallet-solana');
 var Phantom = require('./Phantom/Phantom.cjs');
 var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
-var FallbackSolanaConnector = require('./injected/FallbackSolanaConnector.cjs');
+var FallbackSolanaConnector = require('./injected/FallbackSolanaConnector/FallbackSolanaConnector.cjs');
 
 const SolanaWalletConnectors = (
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/SolanaWalletConnectors.js

@@ -2,7 +2,7 @@
 import { TurnkeySolanaWalletConnectors } from '@dynamic-labs/embedded-wallet-solana';
 import { Phantom } from './Phantom/Phantom.js';
 import { injectedWalletOverrides, fetchInjectedWalletConnectors } from './injected/fetchInjectedWalletConnectors.js';
-import { FallbackSolanaConnector } from './injected/FallbackSolanaConnector.js';
+import { FallbackSolanaConnector } from './injected/FallbackSolanaConnector/FallbackSolanaConnector.js';
 
 const SolanaWalletConnectors = (
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/Solflare/Solflare.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var InjectedWalletBase = require('../injected/InjectedWalletBase.cjs');
+var InjectedWalletBase = require('../injected/InjectedWalletBase/InjectedWalletBase.cjs');
 
 class Solflare extends InjectedWalletBase.InjectedWalletBase {
     constructor() {

package/src/Solflare/Solflare.js

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect, bufferToBase64 } from '@dynamic-labs/utils';
-import { InjectedWalletBase } from '../injected/InjectedWalletBase.js';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase/InjectedWalletBase.js';
 
 class Solflare extends InjectedWalletBase {
     constructor() {

package/src/index.cjs

@@ -6,8 +6,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var assertPackageVersion = require('@dynamic-labs/assert-package-version');
 var _package = require('../package.cjs');
 var solanaCore = require('@dynamic-labs/solana-core');
-var BackpackSol = require('./injected/BackpackSol.cjs');
-var InjectedWalletBase = require('./injected/InjectedWalletBase.cjs');
+var BackpackSol = require('./injected/BackpackSol/BackpackSol.cjs');
+var InjectedWalletBase = require('./injected/InjectedWalletBase/InjectedWalletBase.cjs');
 var SolanaWalletConnectors = require('./SolanaWalletConnectors.cjs');
 var SolanaWalletConnectorsWithConfig = require('./SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.cjs');
 var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');

package/src/index.js

@@ -2,8 +2,8 @@
 import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
 import { version } from '../package.js';
 export { SolanaWalletConnector, isSolanaWallet } from '@dynamic-labs/solana-core';
-export { BackpackSol as BackpackConnector } from './injected/BackpackSol.js';
-export { InjectedWalletBase as SolanaInjectedConnector } from './injected/InjectedWalletBase.js';
+export { BackpackSol as BackpackConnector } from './injected/BackpackSol/BackpackSol.js';
+export { InjectedWalletBase as SolanaInjectedConnector } from './injected/InjectedWalletBase/InjectedWalletBase.js';
 export { SolanaWalletConnectors } from './SolanaWalletConnectors.js';
 export { SolanaWalletConnectorsWithConfig } from './SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.js';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';

package/src/injected/{BackpackSol.cjs → BackpackSol/BackpackSol.cjs}

@@ -3,9 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../_virtual/_tslib.cjs');
+var _tslib = require('../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var InjectedWalletBase = require('../InjectedWalletBase/InjectedWalletBase.cjs');
 
 class BackpackSol extends InjectedWalletBase.InjectedWalletBase {
     constructor() {

package/src/injected/{BackpackSol.d.ts → BackpackSol/BackpackSol.d.ts}

@@ -1,4 +1,4 @@
-import { InjectedWalletBase } from './InjectedWalletBase';
+import { InjectedWalletBase } from '../InjectedWalletBase';
 export declare class BackpackSol extends InjectedWalletBase {
     name: string;
     overrideKey: string;

package/src/injected/{BackpackSol.js → BackpackSol/BackpackSol.js}

@@ -1,7 +1,7 @@
 'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
+import { __awaiter } from '../../../_virtual/_tslib.js';
 import { bufferToBase64 } from '@dynamic-labs/utils';
-import { InjectedWalletBase } from './InjectedWalletBase.js';
+import { InjectedWalletBase } from '../InjectedWalletBase/InjectedWalletBase.js';
 
 class BackpackSol extends InjectedWalletBase {
     constructor() {

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

@@ -0,0 +1 @@
+export * from './BackpackSol';

package/src/injected/{FallbackSolanaConnector.cjs → FallbackSolanaConnector/FallbackSolanaConnector.cjs}

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var InjectedWalletBase = require('../InjectedWalletBase/InjectedWalletBase.cjs');
 
 class FallbackSolanaConnector extends InjectedWalletBase.InjectedWalletBase {
     constructor() {

package/src/injected/{FallbackSolanaConnector.d.ts → FallbackSolanaConnector/FallbackSolanaConnector.d.ts}

@@ -1,4 +1,4 @@
-import { InjectedWalletBase } from './InjectedWalletBase';
+import { InjectedWalletBase } from '../InjectedWalletBase';
 export declare class FallbackSolanaConnector extends InjectedWalletBase {
     name: string;
     overrideKey: string;

package/src/injected/{FallbackSolanaConnector.js → FallbackSolanaConnector/FallbackSolanaConnector.js}

@@ -1,5 +1,5 @@
 'use client'
-import { InjectedWalletBase } from './InjectedWalletBase.js';
+import { InjectedWalletBase } from '../InjectedWalletBase/InjectedWalletBase.js';
 
 class FallbackSolanaConnector extends InjectedWalletBase {
     constructor() {

package/src/injected/FallbackSolanaConnector/index.d.ts

@@ -0,0 +1 @@
+export * from './FallbackSolanaConnector';

package/src/injected/{InjectedWalletBase.cjs → InjectedWalletBase/InjectedWalletBase.cjs}

@@ -3,12 +3,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../_virtual/_tslib.cjs');
+var _tslib = require('../../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
 var utils = require('@dynamic-labs/utils');
 var solanaCore = require('@dynamic-labs/solana-core');
-var SolProviderHelper = require('../SolProviderHelper/SolProviderHelper.cjs');
-var SignMessageNotSupportedError = require('../errors/SignMessageNotSupportedError.cjs');
+var SolProviderHelper = require('../../SolProviderHelper/SolProviderHelper.cjs');
+var SignMessageNotSupportedError = require('../../errors/SignMessageNotSupportedError.cjs');
 
 class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
     get solProviderHelper() {

package/src/injected/{InjectedWalletBase.d.ts → InjectedWalletBase/InjectedWalletBase.d.ts}

@@ -1,7 +1,7 @@
 import { SolanaWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
 import { IUITransaction } from '@dynamic-labs/types';
 import { ISendBalanceWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { SolProviderHelper } from '../SolProviderHelper';
+import { SolProviderHelper } from '../../SolProviderHelper';
 export declare abstract class InjectedWalletBase extends SolanaWalletConnector implements ISendBalanceWalletConnector {
     _solProviderHelper: SolProviderHelper | undefined;
     get solProviderHelper(): SolProviderHelper | undefined;

package/src/injected/{InjectedWalletBase.js → InjectedWalletBase/InjectedWalletBase.js}

@@ -1,10 +1,10 @@
 'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
+import { __awaiter } from '../../../_virtual/_tslib.js';
 import { PublicKey } from '@solana/web3.js';
 import { isMobile, template } from '@dynamic-labs/utils';
 import { SolanaWalletConnector, SolanaUiTransaction } from '@dynamic-labs/solana-core';
-import { SolProviderHelper } from '../SolProviderHelper/SolProviderHelper.js';
-import { SignMessageNotSupportedError } from '../errors/SignMessageNotSupportedError.js';
+import { SolProviderHelper } from '../../SolProviderHelper/SolProviderHelper.js';
+import { SignMessageNotSupportedError } from '../../errors/SignMessageNotSupportedError.js';
 
 class InjectedWalletBase extends SolanaWalletConnector {
     get solProviderHelper() {

package/src/injected/InjectedWalletBase/index.d.ts

@@ -0,0 +1 @@
+export * from './InjectedWalletBase';

package/src/injected/{PhantomInjected.cjs → PhantomInjected/PhantomInjected.cjs}

@@ -3,9 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../_virtual/_tslib.cjs');
+var _tslib = require('../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var InjectedWalletBase = require('../InjectedWalletBase/InjectedWalletBase.cjs');
 
 class PhantomInjected extends InjectedWalletBase.InjectedWalletBase {
     constructor() {

package/src/injected/{PhantomInjected.d.ts → PhantomInjected/PhantomInjected.d.ts}

@@ -1,4 +1,4 @@
-import { InjectedWalletBase } from './InjectedWalletBase';
+import { InjectedWalletBase } from '../InjectedWalletBase';
 export declare class PhantomInjected extends InjectedWalletBase {
     name: string;
     overrideKey: string;

package/src/injected/{PhantomInjected.js → PhantomInjected/PhantomInjected.js}

@@ -1,7 +1,7 @@
 'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
+import { __awaiter } from '../../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect } from '@dynamic-labs/utils';
-import { InjectedWalletBase } from './InjectedWalletBase.js';
+import { InjectedWalletBase } from '../InjectedWalletBase/InjectedWalletBase.js';
 
 class PhantomInjected extends InjectedWalletBase {
     constructor() {

package/src/injected/PhantomInjected/index.d.ts

@@ -0,0 +1 @@
+export * from './PhantomInjected';

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -3,50 +3,63 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var utils = require('@dynamic-labs/utils');
 var CoinbaseSolana = require('../CoinbaseSolana/CoinbaseSolana.cjs');
 var Solflare = require('../Solflare/Solflare.cjs');
-var SolanaWalletStandardConnector = require('../SolanaWalletStandardConnector/SolanaWalletStandardConnector.cjs');
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
-var BackpackSol = require('./BackpackSol.cjs');
+var logger = require('../utils/logger.cjs');
+var InjectedWalletBase = require('./InjectedWalletBase/InjectedWalletBase.cjs');
+var BackpackSol = require('./BackpackSol/BackpackSol.cjs');
+var getConnectorConstructorForWalletStandardWallet = require('./walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.cjs');
+var getWalletStandardWallets = require('./walletStandard/getWalletStandardWallets/getWalletStandardWallets.cjs');
 
 const injectedWalletOverrides = [
     CoinbaseSolana.CoinbaseSolana,
     BackpackSol.BackpackSol,
     Solflare.Solflare,
 ];
-const filteredInjectedWalletKeysOverrides = [
+const walletsWithCustomConnectors = [
     'coinbasesolana',
     'phantom',
     'phantomledger',
     'backpacksol',
     'solflare',
 ];
+const shouldAddWalletStandardConnector = (wallet, walletBook) => {
+    var _a, _b, _c, _d, _e, _f;
+    const { name } = wallet;
+    const chain = 'sol';
+    const connectorKey = `${utils.sanitizeName(name)}${chain}`;
+    logger.logger.logVerboseTroubleshootingMessage('[SOL shouldAddWalletStandardConnector]', name, chain, connectorKey, wallet.features);
+    const existingWallet = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).find(([key, wallet]) => {
+        var _a;
+        return key === connectorKey ||
+            walletsWithCustomConnectors.includes(connectorKey) ||
+            (wallet.name === name && ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a[0].chain) === chain);
+    });
+    const hasAllFeatures = Boolean(((_b = wallet.features) === null || _b === void 0 ? void 0 : _b['standard:events']) &&
+        ((_c = wallet.features) === null || _c === void 0 ? void 0 : _c['standard:connect']) &&
+        ((_d = wallet.features) === null || _d === void 0 ? void 0 : _d['solana:signMessage']) &&
+        ((_e = wallet.features) === null || _e === void 0 ? void 0 : _e['solana:signTransaction']) &&
+        ((_f = wallet.features) === null || _f === void 0 ? void 0 : _f['solana:signAndSendTransaction']));
+    logger.logger.logVerboseTroubleshootingMessage('[SOL shouldAddWalletStandardConnector]', {
+        existingWallet,
+        hasAllFeatures,
+        shouldAdd: !existingWallet && hasAllFeatures,
+    });
+    return !existingWallet && hasAllFeatures;
+};
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;
-    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.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;
         const isSolanaWallet = Boolean((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'sol'));
-        const shouldBeFiltered = filteredInjectedWalletKeysOverrides.includes(key);
+        const shouldBeFiltered = walletsWithCustomConnectors.includes(key);
         return isSolanaWallet && !shouldBeFiltered;
     })
         .map(([key, wallet]) => {
-        var _a;
         const { shortName } = wallet;
         const name = shortName || wallet.name;
-        const hasWalletStandard = Boolean((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.walletStandard));
-        if (hasWalletStandard) {
-            const isWalletStandardPresent = Boolean(SolanaWalletStandardConnector.SolanaWalletStandardConnector.getWallet(walletBook, key));
-            if (isWalletStandardPresent) {
-                return class extends SolanaWalletStandardConnector.SolanaWalletStandardConnector {
-                    constructor(props) {
-                        super(Object.assign({}, props));
-                        this.name = name;
-                        this.overrideKey = key;
-                    }
-                };
-            }
-        }
         return class extends InjectedWalletBase.InjectedWalletBase {
             constructor() {
                 super(...arguments);
@@ -56,6 +69,12 @@ const fetchInjectedWalletConnectors = ({ walletBook, }) => {
             }
         };
     });
+    const walletStandardWallets = getWalletStandardWallets.getWalletStandardWallets();
+    const walletStandardConnectors = walletStandardWallets
+        .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook))
+        .map((wallet) => getConnectorConstructorForWalletStandardWallet.getConnectorConstructorForWalletStandardWallet(wallet));
+    logger.logger.logVerboseTroubleshootingMessage('[SOL fetchInjectedWalletConnectors] walletStandardConnectors', walletStandardConnectors.map((w) => w.name));
+    return [...walletBookConnectors, ...walletStandardConnectors];
 };
 
 exports.fetchInjectedWalletConnectors = fetchInjectedWalletConnectors;

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,48 +1,61 @@
 'use client'
+import { sanitizeName } from '@dynamic-labs/utils';
 import { CoinbaseSolana } from '../CoinbaseSolana/CoinbaseSolana.js';
 import { Solflare } from '../Solflare/Solflare.js';
-import { SolanaWalletStandardConnector } from '../SolanaWalletStandardConnector/SolanaWalletStandardConnector.js';
-import { InjectedWalletBase } from './InjectedWalletBase.js';
-import { BackpackSol } from './BackpackSol.js';
+import { logger } from '../utils/logger.js';
+import { InjectedWalletBase } from './InjectedWalletBase/InjectedWalletBase.js';
+import { BackpackSol } from './BackpackSol/BackpackSol.js';
+import { getConnectorConstructorForWalletStandardWallet } from './walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.js';
+import { getWalletStandardWallets } from './walletStandard/getWalletStandardWallets/getWalletStandardWallets.js';
 
 const injectedWalletOverrides = [
     CoinbaseSolana,
     BackpackSol,
     Solflare,
 ];
-const filteredInjectedWalletKeysOverrides = [
+const walletsWithCustomConnectors = [
     'coinbasesolana',
     'phantom',
     'phantomledger',
     'backpacksol',
     'solflare',
 ];
+const shouldAddWalletStandardConnector = (wallet, walletBook) => {
+    var _a, _b, _c, _d, _e, _f;
+    const { name } = wallet;
+    const chain = 'sol';
+    const connectorKey = `${sanitizeName(name)}${chain}`;
+    logger.logVerboseTroubleshootingMessage('[SOL shouldAddWalletStandardConnector]', name, chain, connectorKey, wallet.features);
+    const existingWallet = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).find(([key, wallet]) => {
+        var _a;
+        return key === connectorKey ||
+            walletsWithCustomConnectors.includes(connectorKey) ||
+            (wallet.name === name && ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a[0].chain) === chain);
+    });
+    const hasAllFeatures = Boolean(((_b = wallet.features) === null || _b === void 0 ? void 0 : _b['standard:events']) &&
+        ((_c = wallet.features) === null || _c === void 0 ? void 0 : _c['standard:connect']) &&
+        ((_d = wallet.features) === null || _d === void 0 ? void 0 : _d['solana:signMessage']) &&
+        ((_e = wallet.features) === null || _e === void 0 ? void 0 : _e['solana:signTransaction']) &&
+        ((_f = wallet.features) === null || _f === void 0 ? void 0 : _f['solana:signAndSendTransaction']));
+    logger.logVerboseTroubleshootingMessage('[SOL shouldAddWalletStandardConnector]', {
+        existingWallet,
+        hasAllFeatures,
+        shouldAdd: !existingWallet && hasAllFeatures,
+    });
+    return !existingWallet && hasAllFeatures;
+};
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;
-    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.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;
         const isSolanaWallet = Boolean((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'sol'));
-        const shouldBeFiltered = filteredInjectedWalletKeysOverrides.includes(key);
+        const shouldBeFiltered = walletsWithCustomConnectors.includes(key);
         return isSolanaWallet && !shouldBeFiltered;
     })
         .map(([key, wallet]) => {
-        var _a;
         const { shortName } = wallet;
         const name = shortName || wallet.name;
-        const hasWalletStandard = Boolean((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.walletStandard));
-        if (hasWalletStandard) {
-            const isWalletStandardPresent = Boolean(SolanaWalletStandardConnector.getWallet(walletBook, key));
-            if (isWalletStandardPresent) {
-                return class extends SolanaWalletStandardConnector {
-                    constructor(props) {
-                        super(Object.assign({}, props));
-                        this.name = name;
-                        this.overrideKey = key;
-                    }
-                };
-            }
-        }
         return class extends InjectedWalletBase {
             constructor() {
                 super(...arguments);
@@ -52,6 +65,12 @@ const fetchInjectedWalletConnectors = ({ walletBook, }) => {
             }
         };
     });
+    const walletStandardWallets = getWalletStandardWallets();
+    const walletStandardConnectors = walletStandardWallets
+        .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook))
+        .map((wallet) => getConnectorConstructorForWalletStandardWallet(wallet));
+    logger.logVerboseTroubleshootingMessage('[SOL fetchInjectedWalletConnectors] walletStandardConnectors', walletStandardConnectors.map((w) => w.name));
+    return [...walletBookConnectors, ...walletStandardConnectors];
 };
 
 export { fetchInjectedWalletConnectors, injectedWalletOverrides };