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

package/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+### [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)
+
+
+### Features
+
+* display enabled countries in phone number field ([#5825](https://github.com/dynamic-labs/DynamicAuth/issues/5825)) ([#5868](https://github.com/dynamic-labs/DynamicAuth/issues/5868)) ([640a4a7](https://github.com/dynamic-labs/DynamicAuth/commit/640a4a77c994390ceed759faf186717b38f393a4))
+
+
+### Bug Fixes
+
+* btc getBalance should use ordinal address if payment not available ([#5883](https://github.com/dynamic-labs/DynamicAuth/issues/5883)) ([bc5ac55](https://github.com/dynamic-labs/DynamicAuth/commit/bc5ac5589e90193d41282d23ce037db360dd23e6))
+* phone number in kyc step ([#5875](https://github.com/dynamic-labs/DynamicAuth/issues/5875)) ([#5879](https://github.com/dynamic-labs/DynamicAuth/issues/5879)) ([3d8a5be](https://github.com/dynamic-labs/DynamicAuth/commit/3d8a5bef35d4a13a1068aaf80d2c39e795b097cd))
+
 ### [2.1.1](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0...v2.1.1) (2024-06-04)
 
 ## [2.1.0](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0-alpha.32...v2.1.0) (2024-06-04)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "2.1.1",
+  "version": "2.1.2-alpha.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -27,20 +27,20 @@
   },
   "dependencies": {
     "@solana/web3.js": "1.92.1",
-    "@dynamic-labs/sdk-api-core": "0.0.453",
+    "@dynamic-labs/sdk-api-core": "0.0.460",
     "@wallet-standard/app": "1.0.1",
     "@wallet-standard/base": "1.0.1",
     "@wallet-standard/features": "1.0.3",
     "@wallet-standard/experimental-features": "0.1.1",
     "bs58": "5.0.0",
     "tweetnacl": "1.0.3",
-    "@dynamic-labs/rpc-provider-solana": "2.1.1",
-    "@dynamic-labs/rpc-providers": "2.1.1",
-    "@dynamic-labs/turnkey": "2.1.1",
-    "@dynamic-labs/types": "2.1.1",
-    "@dynamic-labs/utils": "2.1.1",
-    "@dynamic-labs/wallet-book": "2.1.1",
-    "@dynamic-labs/wallet-connector-core": "2.1.1",
+    "@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/solWalletConnector.cjs

@@ -16,6 +16,7 @@ class SolWalletConnector extends walletConnectorCore.WalletConnectorBase {
         var _a;
         super(opts);
         this.isHardwareWalletEnabled = false;
+        this._network = undefined;
         this.verifiedCredentials = [];
         this.supportedChains = ['SOL'];
         this.connectedChain = 'SOL';
@@ -25,19 +26,25 @@ class SolWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     getNetwork() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (this._network) {
+                return this._network;
+            }
             const provider = this.getWalletClient();
             let genesisHash = yield provider.getGenesisHash();
             genesisHash = genesisHash.substring(0, 32);
             // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
+            let network;
             if (genesisHash === '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp') {
-                return 'mainnet';
+                network = 'mainnet';
             }
             else if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
-                return 'devnet';
+                network = 'devnet';
             }
             else {
-                return 'testnet';
+                network = 'testnet';
             }
+            this._network = network;
+            return network;
         });
     }
     getWalletClient() {

package/src/solWalletConnector.d.ts

@@ -10,8 +10,10 @@ export type SolWalletConnectorOpts = {
     solNetworks: GenericNetwork[];
     walletBook: WalletBookSchema;
 };
+type SolanaNetwork = 'mainnet' | 'devnet' | 'testnet';
 export declare abstract class SolWalletConnector extends WalletConnectorBase implements IHardwareWalletConnector {
     isHardwareWalletEnabled: boolean;
+    _network: SolanaNetwork | undefined;
     verifiedCredentials: JwtVerifiedCredential[];
     solNetworks: GenericNetwork[];
     supportedChains: Chain[];
@@ -32,3 +34,4 @@ export declare abstract class SolWalletConnector extends WalletConnectorBase imp
     setVerifiedCredentials(verifiedCredentials: JwtVerifiedCredential[]): void;
     isLedgerAddress(address: string): boolean;
 }
+export {};

package/src/solWalletConnector.js

@@ -12,6 +12,7 @@ class SolWalletConnector extends WalletConnectorBase {
         var _a;
         super(opts);
         this.isHardwareWalletEnabled = false;
+        this._network = undefined;
         this.verifiedCredentials = [];
         this.supportedChains = ['SOL'];
         this.connectedChain = 'SOL';
@@ -21,19 +22,25 @@ class SolWalletConnector extends WalletConnectorBase {
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this._network) {
+                return this._network;
+            }
             const provider = this.getWalletClient();
             let genesisHash = yield provider.getGenesisHash();
             genesisHash = genesisHash.substring(0, 32);
             // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
+            let network;
             if (genesisHash === '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp') {
-                return 'mainnet';
+                network = 'mainnet';
             }
             else if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
-                return 'devnet';
+                network = 'devnet';
             }
             else {
-                return 'testnet';
+                network = 'testnet';
             }
+            this._network = network;
+            return network;
         });
     }
     getWalletClient() {

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';