@dynamic-labs/solana-core 4.6.3 → 4.7.1

package/CHANGELOG.md

@@ -1,4 +1,25 @@
 
+### [4.7.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.7.0...v4.7.1) (2025-02-20)
+
+
+### Bug Fixes
+
+* remove user logout when sdk version change ([#8112](https://github.com/dynamic-labs/dynamic-auth/issues/8112)) ([b1a321f](https://github.com/dynamic-labs/dynamic-auth/commit/b1a321f18231f083aeb365d4dc92e992897a7e1b))
+
+## [4.7.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.6.3...v4.7.0) (2025-02-20)
+
+
+### Features
+
+* 7702 support ([14ee3cd](https://github.com/dynamic-labs/dynamic-auth/commit/14ee3cd3513ac8b3e8e866cc2026b042c706b7e6))
+
+
+### Bug Fixes
+
+* fallback to empty array when token balances is called with an invalid chain ID ([#8108](https://github.com/dynamic-labs/dynamic-auth/issues/8108)) ([7d14ded](https://github.com/dynamic-labs/dynamic-auth/commit/7d14ded6afa0de604901bbc8bc13620d03dc2e8c))
+* improve global connectivity sign typed data reliability ([#8103](https://github.com/dynamic-labs/dynamic-auth/issues/8103)) ([8b0d2dd](https://github.com/dynamic-labs/dynamic-auth/commit/8b0d2ddbeb62a11732a9d59bc6cd4b72d82b9855))
+* **QNTM-2902:** ensure react updates icons ([#8105](https://github.com/dynamic-labs/dynamic-auth/issues/8105)) ([1182c4c](https://github.com/dynamic-labs/dynamic-auth/commit/1182c4cc103c599e6bbff89af9b1312fb96b6d05))
+
 ### [4.6.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.6.2...v4.6.3) (2025-02-14)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana-core",
-  "version": "4.6.3",
+  "version": "4.7.1",
   "description": "Core package for utilities and types for solana",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -21,12 +21,12 @@
     "@dynamic-labs/sdk-api-core": "0.0.628",
     "@solana/web3.js": "1.92.1",
     "@solana/spl-token": "0.4.6",
-    "@dynamic-labs/assert-package-version": "4.6.3",
-    "@dynamic-labs/rpc-providers": "4.6.3",
-    "@dynamic-labs/types": "4.6.3",
-    "@dynamic-labs/utils": "4.6.3",
-    "@dynamic-labs/wallet-book": "4.6.3",
-    "@dynamic-labs/wallet-connector-core": "4.6.3",
+    "@dynamic-labs/assert-package-version": "4.7.1",
+    "@dynamic-labs/rpc-providers": "4.7.1",
+    "@dynamic-labs/types": "4.7.1",
+    "@dynamic-labs/utils": "4.7.1",
+    "@dynamic-labs/wallet-book": "4.7.1",
+    "@dynamic-labs/wallet-connector-core": "4.7.1",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/connector/SolanaWalletConnector.cjs

@@ -11,6 +11,8 @@ var SolanaWallet = require('../wallet/SolanaWallet.cjs');
 var extractNonce = require('../utils/extractNonce/extractNonce.cjs');
 var getGenesisHashLSKey = require('../utils/getGenesisHashLSKey/getGenesisHashLSKey.cjs');
 var getOverrideRpcUrlForNetwork = require('../utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.cjs');
+require('@solana/spl-token');
+var getBackwardsCompatibleSolNetworks = require('../utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.cjs');
 
 const MEMO_PROGRAM_ID = new web3_js.PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
 class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
@@ -22,13 +24,17 @@ class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
         this.ChainWallet = SolanaWallet.SolanaWallet;
         this.supportedChains = ['SOL'];
         this.connectedChain = 'SOL';
-        this.solNetworks = opts.solNetworks;
+        this.solNetworks = getBackwardsCompatibleSolNetworks.getBackwardsCompatibleSolNetworks(opts.solNetworks, opts.connectionConfig);
         this.chainRpcProviders = opts.chainRpcProviders;
         this.connectionConfig = opts.connectionConfig;
         (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
     }
+    /**
+     * @param returnDynamicNetworkId - If true, the dynamic network ID will be returned instead of the network cluster
+     * @returns The network cluster (e.g. 'mainnet', 'testnet', 'devnet') or dynamic network (used for switching networks)
+     */
     getNetwork() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
+        return _tslib.__awaiter(this, arguments, void 0, function* (returnDynamicNetworkId = false) {
             const provider = this.getWalletClient();
             let genesisHash = localStorage.getItem(getGenesisHashLSKey.getGenesisHashLSKey(provider.rpcEndpoint));
             if (!genesisHash) {
@@ -37,17 +43,13 @@ class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
             }
             genesisHash = genesisHash.substring(0, 32);
             // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
-            let network;
             if (genesisHash === '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp') {
-                network = 'mainnet';
-            }
-            else if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
-                network = 'devnet';
+                return returnDynamicNetworkId ? '101' : 'mainnet';
             }
-            else {
-                network = 'testnet';
+            if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
+                return returnDynamicNetworkId ? '103' : 'devnet';
             }
-            return network;
+            return returnDynamicNetworkId ? '102' : 'testnet';
         });
     }
     endSession() {

package/src/connector/SolanaWalletConnector.d.ts

@@ -22,7 +22,11 @@ export declare abstract class SolanaWalletConnector extends WalletConnectorBase<
     connectedChain: Chain;
     protected connectionConfig: SolanaConnectionConfig | undefined;
     constructor(opts: SolanaWalletConnectorOpts);
-    getNetwork(): Promise<string>;
+    /**
+     * @param returnDynamicNetworkId - If true, the dynamic network ID will be returned instead of the network cluster
+     * @returns The network cluster (e.g. 'mainnet', 'testnet', 'devnet') or dynamic network (used for switching networks)
+     */
+    getNetwork(returnDynamicNetworkId?: boolean): Promise<string>;
     endSession(): Promise<void>;
     getWalletClient(): Connection;
     getPublicClient(): Promise<Connection | undefined>;

package/src/connector/SolanaWalletConnector.js

@@ -7,6 +7,8 @@ import { SolanaWallet } from '../wallet/SolanaWallet.js';
 import { extractNonce } from '../utils/extractNonce/extractNonce.js';
 import { getGenesisHashLSKey } from '../utils/getGenesisHashLSKey/getGenesisHashLSKey.js';
 import { getOverrideRpcUrlForNetwork } from '../utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.js';
+import '@solana/spl-token';
+import { getBackwardsCompatibleSolNetworks } from '../utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.js';
 
 const MEMO_PROGRAM_ID = new PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
 class SolanaWalletConnector extends WalletConnectorBase {
@@ -18,13 +20,17 @@ class SolanaWalletConnector extends WalletConnectorBase {
         this.ChainWallet = SolanaWallet;
         this.supportedChains = ['SOL'];
         this.connectedChain = 'SOL';
-        this.solNetworks = opts.solNetworks;
+        this.solNetworks = getBackwardsCompatibleSolNetworks(opts.solNetworks, opts.connectionConfig);
         this.chainRpcProviders = opts.chainRpcProviders;
         this.connectionConfig = opts.connectionConfig;
         (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
     }
+    /**
+     * @param returnDynamicNetworkId - If true, the dynamic network ID will be returned instead of the network cluster
+     * @returns The network cluster (e.g. 'mainnet', 'testnet', 'devnet') or dynamic network (used for switching networks)
+     */
     getNetwork() {
-        return __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, arguments, void 0, function* (returnDynamicNetworkId = false) {
             const provider = this.getWalletClient();
             let genesisHash = localStorage.getItem(getGenesisHashLSKey(provider.rpcEndpoint));
             if (!genesisHash) {
@@ -33,17 +39,13 @@ class SolanaWalletConnector extends WalletConnectorBase {
             }
             genesisHash = genesisHash.substring(0, 32);
             // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
-            let network;
             if (genesisHash === '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp') {
-                network = 'mainnet';
-            }
-            else if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
-                network = 'devnet';
+                return returnDynamicNetworkId ? '101' : 'mainnet';
             }
-            else {
-                network = 'testnet';
+            if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
+                return returnDynamicNetworkId ? '103' : 'devnet';
             }
-            return network;
+            return returnDynamicNetworkId ? '102' : 'testnet';
         });
     }
     endSession() {

package/src/index.cjs

@@ -18,6 +18,7 @@ var isTransactionSigned = require('./utils/isTransactionSigned/isTransactionSign
 var getOverrideRpcUrlForNetwork = require('./utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.cjs');
 var createNonNativeTokenTransfer = require('./utils/createNonNativeTokenTransfer/createNonNativeTokenTransfer.cjs');
 var createSolTransfer = require('./utils/createSolTransfer/createSolTransfer.cjs');
+var getBackwardsCompatibleSolNetworks = require('./utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.cjs');
 var SolanaWallet = require('./wallet/SolanaWallet.cjs');
 var isSolanaWallet = require('./wallet/isSolanaWallet/isSolanaWallet.cjs');
 var isLedgerSolanaWallet = require('./wallet/isLedgerSolanaWallet/isLedgerSolanaWallet.cjs');
@@ -36,6 +37,7 @@ exports.isTxAlreadySigned = isTransactionSigned.isTxAlreadySigned;
 exports.getOverrideRpcUrlForNetwork = getOverrideRpcUrlForNetwork.getOverrideRpcUrlForNetwork;
 exports.createNonNativeTokenTransfer = createNonNativeTokenTransfer.createNonNativeTokenTransfer;
 exports.createSolTransfer = createSolTransfer.createSolTransfer;
+exports.getBackwardsCompatibleSolNetworks = getBackwardsCompatibleSolNetworks.getBackwardsCompatibleSolNetworks;
 exports.SolanaWallet = SolanaWallet.SolanaWallet;
 exports.isSolanaWallet = isSolanaWallet.isSolanaWallet;
 exports.isLedgerSolanaWallet = isLedgerSolanaWallet.isLedgerSolanaWallet;

package/src/index.js

@@ -14,6 +14,7 @@ export { isTxAlreadySigned } from './utils/isTransactionSigned/isTransactionSign
 export { getOverrideRpcUrlForNetwork } from './utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.js';
 export { createNonNativeTokenTransfer } from './utils/createNonNativeTokenTransfer/createNonNativeTokenTransfer.js';
 export { createSolTransfer } from './utils/createSolTransfer/createSolTransfer.js';
+export { getBackwardsCompatibleSolNetworks } from './utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.js';
 export { SolanaWallet } from './wallet/SolanaWallet.js';
 export { isSolanaWallet } from './wallet/isSolanaWallet/isSolanaWallet.js';
 export { isLedgerSolanaWallet } from './wallet/isLedgerSolanaWallet/isLedgerSolanaWallet.js';

package/src/utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.cjs

@@ -0,0 +1,86 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var getOverrideRpcUrlForNetwork = require('../getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.cjs');
+
+const SOLANA_MAINNET_NETWORK = {
+    blockExplorerUrls: ['https://explorer.solana.com'],
+    chainId: '101',
+    genesisHash: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+    iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
+    name: 'Solana Mainnet',
+    nativeCurrency: {
+        decimals: 9,
+        iconUrl: 'https://app.dynamic.xyz/assets/networks/solana.svg',
+        name: 'Solana',
+        pricingProviderTokenId: 'solana',
+        symbol: 'SOL',
+    },
+    networkId: '101',
+    rpcUrls: ['https://api.mainnet-beta.solana.com'],
+    vanityName: 'Solana',
+};
+const SOLANA_TESTNET_NETWORK = {
+    blockExplorerUrls: ['https://explorer.solana.com/?cluster=testnet'],
+    chainId: '102',
+    genesisHash: '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
+    iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
+    name: 'Solana Testnet',
+    nativeCurrency: {
+        decimals: 9,
+        iconUrl: 'https://app.dynamic.xyz/assets/networks/solana.svg',
+        name: 'Solana',
+        pricingProviderTokenId: 'solana',
+        symbol: 'SOL',
+    },
+    networkId: '102',
+    rpcUrls: ['https://api.testnet.solana.com'],
+};
+const SOLANA_DEVNET_NETWORK = {
+    blockExplorerUrls: ['https://explorer.solana.com/?cluster=devnet'],
+    chainId: '103',
+    genesisHash: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG',
+    iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
+    name: 'Solana Devnet',
+    nativeCurrency: {
+        decimals: 9,
+        iconUrl: 'https://app.dynamic.xyz/assets/networks/solana.svg',
+        name: 'Solana',
+        pricingProviderTokenId: 'solana',
+        symbol: 'SOL',
+    },
+    networkId: '103',
+    rpcUrls: ['https://api.devnet.solana.com'],
+};
+const getBackwardsCompatibleSolNetworks = (originalSolNetworks, connectionConfig) => {
+    if (!(originalSolNetworks === null || originalSolNetworks === void 0 ? void 0 : originalSolNetworks.length)) {
+        return [];
+    }
+    if (originalSolNetworks.length > 1) {
+        return originalSolNetworks;
+    }
+    // because we didn't have multi-network support in the past,
+    // customer would just pass in testnet/devnet rpc urls to the mainnet network
+    // so we need to check the rpc and return the correct/expected network data
+    const rpcUrl = getOverrideRpcUrlForNetwork.getOverrideRpcUrlForNetwork(connectionConfig, originalSolNetworks[0]);
+    if (rpcUrl.includes('testnet')) {
+        return [
+            Object.assign(Object.assign({}, SOLANA_TESTNET_NETWORK), { privateCustomerRpcUrls: [rpcUrl] }),
+        ];
+    }
+    if (rpcUrl.includes('devnet')) {
+        return [
+            Object.assign(Object.assign({}, SOLANA_DEVNET_NETWORK), { privateCustomerRpcUrls: [rpcUrl] }),
+        ];
+    }
+    if (rpcUrl.includes('mainnet')) {
+        return [
+            Object.assign(Object.assign({}, SOLANA_MAINNET_NETWORK), { privateCustomerRpcUrls: [rpcUrl] }),
+        ];
+    }
+    return originalSolNetworks;
+};
+
+exports.getBackwardsCompatibleSolNetworks = getBackwardsCompatibleSolNetworks;

package/src/utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.d.ts

@@ -0,0 +1,3 @@
+import { GenericNetwork } from '@dynamic-labs/types';
+import { SolanaConnectionConfig } from '../../types';
+export declare const getBackwardsCompatibleSolNetworks: (originalSolNetworks: GenericNetwork[], connectionConfig?: SolanaConnectionConfig) => GenericNetwork[];

package/src/utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.js

@@ -0,0 +1,82 @@
+'use client'
+import { getOverrideRpcUrlForNetwork } from '../getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.js';
+
+const SOLANA_MAINNET_NETWORK = {
+    blockExplorerUrls: ['https://explorer.solana.com'],
+    chainId: '101',
+    genesisHash: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+    iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
+    name: 'Solana Mainnet',
+    nativeCurrency: {
+        decimals: 9,
+        iconUrl: 'https://app.dynamic.xyz/assets/networks/solana.svg',
+        name: 'Solana',
+        pricingProviderTokenId: 'solana',
+        symbol: 'SOL',
+    },
+    networkId: '101',
+    rpcUrls: ['https://api.mainnet-beta.solana.com'],
+    vanityName: 'Solana',
+};
+const SOLANA_TESTNET_NETWORK = {
+    blockExplorerUrls: ['https://explorer.solana.com/?cluster=testnet'],
+    chainId: '102',
+    genesisHash: '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
+    iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
+    name: 'Solana Testnet',
+    nativeCurrency: {
+        decimals: 9,
+        iconUrl: 'https://app.dynamic.xyz/assets/networks/solana.svg',
+        name: 'Solana',
+        pricingProviderTokenId: 'solana',
+        symbol: 'SOL',
+    },
+    networkId: '102',
+    rpcUrls: ['https://api.testnet.solana.com'],
+};
+const SOLANA_DEVNET_NETWORK = {
+    blockExplorerUrls: ['https://explorer.solana.com/?cluster=devnet'],
+    chainId: '103',
+    genesisHash: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG',
+    iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
+    name: 'Solana Devnet',
+    nativeCurrency: {
+        decimals: 9,
+        iconUrl: 'https://app.dynamic.xyz/assets/networks/solana.svg',
+        name: 'Solana',
+        pricingProviderTokenId: 'solana',
+        symbol: 'SOL',
+    },
+    networkId: '103',
+    rpcUrls: ['https://api.devnet.solana.com'],
+};
+const getBackwardsCompatibleSolNetworks = (originalSolNetworks, connectionConfig) => {
+    if (!(originalSolNetworks === null || originalSolNetworks === void 0 ? void 0 : originalSolNetworks.length)) {
+        return [];
+    }
+    if (originalSolNetworks.length > 1) {
+        return originalSolNetworks;
+    }
+    // because we didn't have multi-network support in the past,
+    // customer would just pass in testnet/devnet rpc urls to the mainnet network
+    // so we need to check the rpc and return the correct/expected network data
+    const rpcUrl = getOverrideRpcUrlForNetwork(connectionConfig, originalSolNetworks[0]);
+    if (rpcUrl.includes('testnet')) {
+        return [
+            Object.assign(Object.assign({}, SOLANA_TESTNET_NETWORK), { privateCustomerRpcUrls: [rpcUrl] }),
+        ];
+    }
+    if (rpcUrl.includes('devnet')) {
+        return [
+            Object.assign(Object.assign({}, SOLANA_DEVNET_NETWORK), { privateCustomerRpcUrls: [rpcUrl] }),
+        ];
+    }
+    if (rpcUrl.includes('mainnet')) {
+        return [
+            Object.assign(Object.assign({}, SOLANA_MAINNET_NETWORK), { privateCustomerRpcUrls: [rpcUrl] }),
+        ];
+    }
+    return originalSolNetworks;
+};
+
+export { getBackwardsCompatibleSolNetworks };

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

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

package/src/utils/index.d.ts

@@ -7,3 +7,4 @@ export { isTxAlreadySigned } from './isTransactionSigned';
 export { getOverrideRpcUrlForNetwork } from './getOverrideRpcUrlForNetwork';
 export { createNonNativeTokenTransfer } from './createNonNativeTokenTransfer';
 export { createSolTransfer } from './createSolTransfer';
+export { getBackwardsCompatibleSolNetworks } from './getBackwardsCompatibleSolNetworks';