@dynamic-labs/solana 2.1.2-alpha.0 → 2.1.2-alpha.1

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [2.1.2-alpha.1](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.2-alpha.0...v2.1.2-alpha.1) (2024-06-07)
+
+
+### Bug Fixes
+
+* find phantom solana provider when opening dapp on new tab ([#5902](https://github.com/dynamic-labs/DynamicAuth/issues/5902)) ([99daf87](https://github.com/dynamic-labs/DynamicAuth/commit/99daf87f17caed870a76e4f89a257a14da37c7ab)), closes [#5895](https://github.com/dynamic-labs/DynamicAuth/issues/5895) [#5896](https://github.com/dynamic-labs/DynamicAuth/issues/5896) [#5897](https://github.com/dynamic-labs/DynamicAuth/issues/5897)
+
 ### [2.1.2-alpha.0](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.1...v2.1.2-alpha.0) (2024-06-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "2.1.2-alpha.0",
+  "version": "2.1.2-alpha.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -34,13 +34,13 @@
     "@wallet-standard/experimental-features": "0.1.1",
     "bs58": "5.0.0",
     "tweetnacl": "1.0.3",
-    "@dynamic-labs/rpc-provider-solana": "2.1.2-alpha.0",
-    "@dynamic-labs/rpc-providers": "2.1.2-alpha.0",
-    "@dynamic-labs/turnkey": "2.1.2-alpha.0",
-    "@dynamic-labs/types": "2.1.2-alpha.0",
-    "@dynamic-labs/utils": "2.1.2-alpha.0",
-    "@dynamic-labs/wallet-book": "2.1.2-alpha.0",
-    "@dynamic-labs/wallet-connector-core": "2.1.2-alpha.0",
+    "@dynamic-labs/rpc-provider-solana": "2.1.2-alpha.1",
+    "@dynamic-labs/rpc-providers": "2.1.2-alpha.1",
+    "@dynamic-labs/turnkey": "2.1.2-alpha.1",
+    "@dynamic-labs/types": "2.1.2-alpha.1",
+    "@dynamic-labs/utils": "2.1.2-alpha.1",
+    "@dynamic-labs/wallet-book": "2.1.2-alpha.1",
+    "@dynamic-labs/wallet-connector-core": "2.1.2-alpha.1",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/solProviderHelper.cjs

@@ -7,6 +7,7 @@ var _tslib = require('../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var isSignedMessage = require('./utils/isSignedMessage.cjs');
+var findWalletProviderFromWalletStandard = require('./utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.cjs');
 
 class SolProviderHelper {
     constructor(wallet) {
@@ -26,6 +27,7 @@ class SolProviderHelper {
         return this.installedProviderLookup(config.extensionLocators);
     }
     installedProviders() {
+        var _a, _b;
         const config = this.getInjectedConfig();
         if (!config)
             return [];
@@ -48,6 +50,12 @@ class SolProviderHelper {
                 window.solana.providers.forEach((provider) => providers.push(provider));
             }
         }
+        if (((_b = (_a = config.walletStandardLocators) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) {
+            const walletStandardProvider = findWalletProviderFromWalletStandard.findWalletProviderFromWalletStandard(config);
+            if (walletStandardProvider) {
+                providers.push(walletStandardProvider);
+            }
+        }
         return providers;
     }
     installedProviderLookup(extensionLocators) {

package/src/solProviderHelper.d.ts

@@ -15,6 +15,10 @@ export declare class SolProviderHelper {
             features: string[];
             name: string;
         } | undefined;
+        walletStandardLocators?: {
+            name: string;
+            locator: string;
+        }[] | undefined;
         windowLocations?: string[] | undefined;
     } | undefined;
     getInstalledProvider(): ISolana | undefined;

package/src/solProviderHelper.js

@@ -3,6 +3,7 @@ import { __awaiter } from '../_virtual/_tslib.js';
 import { getProvidersFromWindow, bufferToBase64 } from '@dynamic-labs/utils';
 import { ProviderLookup } from '@dynamic-labs/wallet-connector-core';
 import { isSignedMessage } from './utils/isSignedMessage.js';
+import { findWalletProviderFromWalletStandard } from './utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.js';
 
 class SolProviderHelper {
     constructor(wallet) {
@@ -22,6 +23,7 @@ class SolProviderHelper {
         return this.installedProviderLookup(config.extensionLocators);
     }
     installedProviders() {
+        var _a, _b;
         const config = this.getInjectedConfig();
         if (!config)
             return [];
@@ -44,6 +46,12 @@ class SolProviderHelper {
                 window.solana.providers.forEach((provider) => providers.push(provider));
             }
         }
+        if (((_b = (_a = config.walletStandardLocators) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) {
+            const walletStandardProvider = findWalletProviderFromWalletStandard(config);
+            if (walletStandardProvider) {
+                providers.push(walletStandardProvider);
+            }
+        }
         return providers;
     }
     installedProviderLookup(extensionLocators) {

package/src/utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.cjs

@@ -0,0 +1,29 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var app = require('@wallet-standard/app');
+var utils = require('@dynamic-labs/utils');
+
+const findWalletProviderFromWalletStandard = (injectConfig) => {
+    const { walletStandardLocators } = injectConfig;
+    if (!walletStandardLocators || walletStandardLocators.length === 0) {
+        return undefined;
+    }
+    const wallets = app.getWallets().get();
+    return walletStandardLocators.reduce((provider, walletStandardLocator) => {
+        /**
+         * Return early if the provider is already found
+         */
+        if (provider) {
+            return provider;
+        }
+        const wallet = wallets.find((w) => w.name === walletStandardLocator.name);
+        if (!wallet)
+            return undefined;
+        return utils.get(wallet, walletStandardLocator.locator);
+    }, undefined);
+};
+
+exports.findWalletProviderFromWalletStandard = findWalletProviderFromWalletStandard;

package/src/utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.d.ts

@@ -0,0 +1,3 @@
+import { WalletSchema } from '@dynamic-labs/wallet-book';
+import { ISolana } from '../../types';
+export declare const findWalletProviderFromWalletStandard: (injectConfig: NonNullable<WalletSchema['injectedConfig']>[number]) => ISolana | undefined;

package/src/utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.js

@@ -0,0 +1,25 @@
+'use client'
+import { getWallets } from '@wallet-standard/app';
+import { get } from '@dynamic-labs/utils';
+
+const findWalletProviderFromWalletStandard = (injectConfig) => {
+    const { walletStandardLocators } = injectConfig;
+    if (!walletStandardLocators || walletStandardLocators.length === 0) {
+        return undefined;
+    }
+    const wallets = getWallets().get();
+    return walletStandardLocators.reduce((provider, walletStandardLocator) => {
+        /**
+         * Return early if the provider is already found
+         */
+        if (provider) {
+            return provider;
+        }
+        const wallet = wallets.find((w) => w.name === walletStandardLocator.name);
+        if (!wallet)
+            return undefined;
+        return get(wallet, walletStandardLocator.locator);
+    }, undefined);
+};
+
+export { findWalletProviderFromWalletStandard };

package/src/utils/findWalletProviderFromWalletStandard/index.d.ts

@@ -0,0 +1 @@
+export { findWalletProviderFromWalletStandard } from './findWalletProviderFromWalletStandard';