@dynamic-labs/solana-core 4.4.0 → 4.4.1

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+### [4.4.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.4.0...v4.4.1) (2025-01-27)
+
+
+### Features
+
+* allow override of rpc urls in connectionConfig for Solana and Eclipse ([#7884](https://github.com/dynamic-labs/dynamic-auth/issues/7884)) ([b65cea0](https://github.com/dynamic-labs/dynamic-auth/commit/b65cea0f7f5240c0e021843266c1437feffa51c5))
+
+
+### Bug Fixes
+
+* close banxa modal when clicking outside of modal ([#7890](https://github.com/dynamic-labs/dynamic-auth/issues/7890)) ([cc5b5a5](https://github.com/dynamic-labs/dynamic-auth/commit/cc5b5a5911615925065411472f7874aeafff0a25))
+
 ## [4.4.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.3.2...v4.4.0) (2025-01-24)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana-core",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "Core package for utilities and types for solana",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -23,12 +23,12 @@
     "@solana/spl-token": "0.4.6"
   },
   "peerDependencies": {
-    "@dynamic-labs/assert-package-version": "4.4.0",
-    "@dynamic-labs/rpc-providers": "4.4.0",
-    "@dynamic-labs/types": "4.4.0",
-    "@dynamic-labs/utils": "4.4.0",
-    "@dynamic-labs/wallet-book": "4.4.0",
-    "@dynamic-labs/wallet-connector-core": "4.4.0",
+    "@dynamic-labs/assert-package-version": "4.4.1",
+    "@dynamic-labs/rpc-providers": "4.4.1",
+    "@dynamic-labs/types": "4.4.1",
+    "@dynamic-labs/utils": "4.4.1",
+    "@dynamic-labs/wallet-book": "4.4.1",
+    "@dynamic-labs/wallet-connector-core": "4.4.1",
     "eventemitter3": "5.0.1"
   }
 }

package/src/connector/SolanaWalletConnector.cjs

@@ -10,6 +10,7 @@ var utils = require('@dynamic-labs/utils');
 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');
 
 const MEMO_PROGRAM_ID = new web3_js.PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
 class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
@@ -55,13 +56,13 @@ class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
         });
     }
     getWalletClient() {
-        var _a, _b;
+        var _a;
         const [network] = this.solNetworks;
         if (!network) {
             throw new utils.DynamicError('No enabled networks');
         }
-        const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-        return new web3_js.Connection(rpcUrl, (_b = this.connectionConfig) !== null && _b !== void 0 ? _b : 'confirmed');
+        const rpcUrl = getOverrideRpcUrlForNetwork.getOverrideRpcUrlForNetwork(this.connectionConfig, network);
+        return new web3_js.Connection(rpcUrl, (_a = this.connectionConfig) !== null && _a !== void 0 ? _a : 'confirmed');
     }
     getPublicClient() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/connector/SolanaWalletConnector.d.ts

@@ -1,17 +1,17 @@
-import { Connection, ConnectionConfig } from '@solana/web3.js';
+import { Connection } from '@solana/web3.js';
 import { Chain, IHardwareWalletConnector, WalletConnectorBase, WalletMetadata } from '@dynamic-labs/wallet-connector-core';
 import { GenericNetwork } from '@dynamic-labs/types';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
 import { IChainRpcProviders } from '../rpc';
 import { SolanaWallet } from '../wallet';
-import { ISolana } from '../types';
+import { ISolana, SolanaConnectionConfig } from '../types';
 export type SolanaWalletConnectorOpts = {
     chainRpcProviders: IChainRpcProviders;
     solNetworks: GenericNetwork[];
     walletBook: WalletBookSchema;
     metadata?: WalletMetadata;
-    connectionConfig?: ConnectionConfig;
+    connectionConfig?: SolanaConnectionConfig;
 };
 export declare abstract class SolanaWalletConnector extends WalletConnectorBase<typeof SolanaWallet> implements IHardwareWalletConnector {
     isHardwareWalletEnabled: boolean;
@@ -20,7 +20,7 @@ export declare abstract class SolanaWalletConnector extends WalletConnectorBase<
     ChainWallet: typeof SolanaWallet;
     supportedChains: Chain[];
     connectedChain: Chain;
-    protected connectionConfig: ConnectionConfig | undefined;
+    protected connectionConfig: SolanaConnectionConfig | undefined;
     constructor(opts: SolanaWalletConnectorOpts);
     getNetwork(): Promise<string>;
     endSession(): Promise<void>;

package/src/connector/SolanaWalletConnector.js

@@ -6,6 +6,7 @@ import { DynamicError, isLedgerAddressViaVerifiedCredentials, NotSupportedError
 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';
 
 const MEMO_PROGRAM_ID = new PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
 class SolanaWalletConnector extends WalletConnectorBase {
@@ -51,13 +52,13 @@ class SolanaWalletConnector extends WalletConnectorBase {
         });
     }
     getWalletClient() {
-        var _a, _b;
+        var _a;
         const [network] = this.solNetworks;
         if (!network) {
             throw new DynamicError('No enabled networks');
         }
-        const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-        return new Connection(rpcUrl, (_b = this.connectionConfig) !== null && _b !== void 0 ? _b : 'confirmed');
+        const rpcUrl = getOverrideRpcUrlForNetwork(this.connectionConfig, network);
+        return new Connection(rpcUrl, (_a = this.connectionConfig) !== null && _a !== void 0 ? _a : 'confirmed');
     }
     getPublicClient() {
         return __awaiter(this, void 0, void 0, function* () {

package/src/index.cjs

@@ -15,6 +15,7 @@ var isVersionedTransaction = require('./utils/isVersionedTransaction/isVersioned
 var encodeTransactionToBase64 = require('./utils/encodeTransactionToBase64/encodeTransactionToBase64.cjs');
 var getGenesisHashLSKey = require('./utils/getGenesisHashLSKey/getGenesisHashLSKey.cjs');
 var isTransactionSigned = require('./utils/isTransactionSigned/isTransactionSigned.cjs');
+var getOverrideRpcUrlForNetwork = require('./utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.cjs');
 var SolanaWallet = require('./wallet/SolanaWallet.cjs');
 var isSolanaWallet = require('./wallet/isSolanaWallet/isSolanaWallet.cjs');
 var isLedgerSolanaWallet = require('./wallet/isLedgerSolanaWallet/isLedgerSolanaWallet.cjs');
@@ -30,6 +31,7 @@ exports.isVersionedTransaction = isVersionedTransaction.isVersionedTransaction;
 exports.encodeTransactionToBase64 = encodeTransactionToBase64.encodeTransactionToBase64;
 exports.getGenesisHashLSKey = getGenesisHashLSKey.getGenesisHashLSKey;
 exports.isTxAlreadySigned = isTransactionSigned.isTxAlreadySigned;
+exports.getOverrideRpcUrlForNetwork = getOverrideRpcUrlForNetwork.getOverrideRpcUrlForNetwork;
 exports.SolanaWallet = SolanaWallet.SolanaWallet;
 exports.isSolanaWallet = isSolanaWallet.isSolanaWallet;
 exports.isLedgerSolanaWallet = isLedgerSolanaWallet.isLedgerSolanaWallet;

package/src/index.d.ts

@@ -3,4 +3,4 @@ export * from './rpc';
 export * from './utils';
 export * from './wallet';
 export { SOLANA_GENESIS_HASH } from './constants';
-export type { ConnectionResult, ExtensionLocator, ISolana, IBackpackSolanaSigner, SignedMessage, ISolanaSigner, } from './types';
+export type { ConnectionResult, ExtensionLocator, ISolana, IBackpackSolanaSigner, SignedMessage, ISolanaSigner, SolanaConnectionConfig, } from './types';

package/src/index.js

@@ -11,6 +11,7 @@ export { isVersionedTransaction } from './utils/isVersionedTransaction/isVersion
 export { encodeTransactionToBase64 } from './utils/encodeTransactionToBase64/encodeTransactionToBase64.js';
 export { getGenesisHashLSKey } from './utils/getGenesisHashLSKey/getGenesisHashLSKey.js';
 export { isTxAlreadySigned } from './utils/isTransactionSigned/isTransactionSigned.js';
+export { getOverrideRpcUrlForNetwork } from './utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.js';
 export { SolanaWallet } from './wallet/SolanaWallet.js';
 export { isSolanaWallet } from './wallet/isSolanaWallet/isSolanaWallet.js';
 export { isLedgerSolanaWallet } from './wallet/isLedgerSolanaWallet/isLedgerSolanaWallet.js';

package/src/rpc/RpcProviderSolana/RpcProviderSolana.cjs

@@ -3,6 +3,10 @@
 
 var web3_js = require('@solana/web3.js');
 var rpcProviders = require('@dynamic-labs/rpc-providers');
+require('../../../_virtual/_tslib.cjs');
+require('@solana/spl-token');
+require('@dynamic-labs/utils');
+var getOverrideRpcUrlForNetwork = require('../../utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.cjs');
 
 rpcProviders.ChainRpcProviders.getSolanaProviderByChainId = (rpcProviders, chainId) => {
     var _a;
@@ -14,8 +18,7 @@ rpcProviders.ChainRpcProviders.registerSolanaProviders = (connectionConfig) => {
         const rpcProviders = {};
         if (config === null || config === void 0 ? void 0 : config.solana) {
             rpcProviders.solana = config.solana.map((network) => {
-                var _a;
-                const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
+                const rpcUrl = getOverrideRpcUrlForNetwork.getOverrideRpcUrlForNetwork(connectionConfig, network);
                 const provider = new web3_js.Connection(rpcUrl, connectionConfig);
                 return {
                     chainId: network.chainId.toString(),

package/src/rpc/RpcProviderSolana/RpcProviderSolana.d.ts

@@ -1,5 +1,6 @@
-import { Connection, ConnectionConfig } from '@solana/web3.js';
+import { Connection } from '@solana/web3.js';
 import { RpcProviders } from '@dynamic-labs/rpc-providers';
+import { SolanaConnectionConfig } from '../../types';
 type ISolanaRpcProvider = {
     chainId: string;
     chainName: string;
@@ -12,7 +13,7 @@ declare module '@dynamic-labs/rpc-providers' {
     }
     interface IChainRpcProviders {
         getSolanaProviderByChainId(rpcProviders: RpcProviders, chainId: string): SolanaRpcProvider | undefined;
-        registerSolanaProviders(connectionConfig?: ConnectionConfig): void;
+        registerSolanaProviders(connectionConfig?: SolanaConnectionConfig): void;
     }
 }
 export {};

package/src/rpc/RpcProviderSolana/RpcProviderSolana.js

@@ -1,6 +1,10 @@
 'use client'
 import { Connection } from '@solana/web3.js';
 import { ChainRpcProviders, ProviderChain } from '@dynamic-labs/rpc-providers';
+import '../../../_virtual/_tslib.js';
+import '@solana/spl-token';
+import '@dynamic-labs/utils';
+import { getOverrideRpcUrlForNetwork } from '../../utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.js';
 
 ChainRpcProviders.getSolanaProviderByChainId = (rpcProviders, chainId) => {
     var _a;
@@ -12,8 +16,7 @@ ChainRpcProviders.registerSolanaProviders = (connectionConfig) => {
         const rpcProviders = {};
         if (config === null || config === void 0 ? void 0 : config.solana) {
             rpcProviders.solana = config.solana.map((network) => {
-                var _a;
-                const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
+                const rpcUrl = getOverrideRpcUrlForNetwork(connectionConfig, network);
                 const provider = new Connection(rpcUrl, connectionConfig);
                 return {
                     chainId: network.chainId.toString(),

package/src/types.d.ts

@@ -1,4 +1,4 @@
-import { Connection, SendOptions, Signer, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
+import { Connection, ConnectionConfig, SendOptions, Signer, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
 import EventEmitter from 'eventemitter3';
 declare global {
     interface IWindowPhantom {
@@ -57,4 +57,10 @@ export type IBackpackSolanaSigner = ISolanaSigner & {
 };
 export type ISolana = ISolanaSigner | IBackpackSolanaSigner;
 export type ExtensionLocator = 'isBraveWallet' | 'isGlow' | 'isPhantom' | 'isSolflare' | 'isExodus' | 'isBackpack' | 'isMagicEden';
+export type SolanaConnectionConfig = ConnectionConfig & {
+    customRpcUrls?: {
+        solana?: string[];
+        eclipse?: string[];
+    };
+};
 export {};

package/src/utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.cjs

@@ -0,0 +1,20 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getOverrideRpcUrlForNetwork = (connectionConfig, network) => {
+    var _a, _b, _c, _d, _e;
+    const isSolanaNetwork = network.name.toLowerCase().includes('solana');
+    const isEclipseNetwork = network.name.toLowerCase().includes('eclipse');
+    let overrideRpcUrl;
+    if (isSolanaNetwork) {
+        overrideRpcUrl = (_b = (_a = connectionConfig === null || connectionConfig === void 0 ? void 0 : connectionConfig.customRpcUrls) === null || _a === void 0 ? void 0 : _a.solana) === null || _b === void 0 ? void 0 : _b[0];
+    }
+    if (isEclipseNetwork) {
+        overrideRpcUrl = (_d = (_c = connectionConfig === null || connectionConfig === void 0 ? void 0 : connectionConfig.customRpcUrls) === null || _c === void 0 ? void 0 : _c.eclipse) === null || _d === void 0 ? void 0 : _d[0];
+    }
+    return (overrideRpcUrl || ((_e = network.privateCustomerRpcUrls) === null || _e === void 0 ? void 0 : _e[0]) || network.rpcUrls[0]);
+};
+
+exports.getOverrideRpcUrlForNetwork = getOverrideRpcUrlForNetwork;

package/src/utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.d.ts

@@ -0,0 +1,3 @@
+import { GenericNetwork } from '@dynamic-labs/types';
+import { SolanaConnectionConfig } from '../../types';
+export declare const getOverrideRpcUrlForNetwork: (connectionConfig: SolanaConnectionConfig | undefined, network: GenericNetwork) => string;

package/src/utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.js

@@ -0,0 +1,16 @@
+'use client'
+const getOverrideRpcUrlForNetwork = (connectionConfig, network) => {
+    var _a, _b, _c, _d, _e;
+    const isSolanaNetwork = network.name.toLowerCase().includes('solana');
+    const isEclipseNetwork = network.name.toLowerCase().includes('eclipse');
+    let overrideRpcUrl;
+    if (isSolanaNetwork) {
+        overrideRpcUrl = (_b = (_a = connectionConfig === null || connectionConfig === void 0 ? void 0 : connectionConfig.customRpcUrls) === null || _a === void 0 ? void 0 : _a.solana) === null || _b === void 0 ? void 0 : _b[0];
+    }
+    if (isEclipseNetwork) {
+        overrideRpcUrl = (_d = (_c = connectionConfig === null || connectionConfig === void 0 ? void 0 : connectionConfig.customRpcUrls) === null || _c === void 0 ? void 0 : _c.eclipse) === null || _d === void 0 ? void 0 : _d[0];
+    }
+    return (overrideRpcUrl || ((_e = network.privateCustomerRpcUrls) === null || _e === void 0 ? void 0 : _e[0]) || network.rpcUrls[0]);
+};
+
+export { getOverrideRpcUrlForNetwork };

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

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

package/src/utils/index.d.ts

@@ -4,3 +4,4 @@ export { isVersionedTransaction } from './isVersionedTransaction';
 export { encodeTransactionToBase64, type EncodedTransaction, } from './encodeTransactionToBase64';
 export { getGenesisHashLSKey } from './getGenesisHashLSKey';
 export { isTxAlreadySigned } from './isTransactionSigned';
+export { getOverrideRpcUrlForNetwork } from './getOverrideRpcUrlForNetwork';

package/src/wallet/isSolanaWallet/isSolanaWallet.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const isSolanaWallet = (wallet) => wallet.chain === 'SOL';
+const isSolanaWallet = (wallet) => ['SOL'].includes(wallet.chain);
 
 exports.isSolanaWallet = isSolanaWallet;

package/src/wallet/isSolanaWallet/isSolanaWallet.js

@@ -1,4 +1,4 @@
 'use client'
-const isSolanaWallet = (wallet) => wallet.chain === 'SOL';
+const isSolanaWallet = (wallet) => ['SOL'].includes(wallet.chain);
 
 export { isSolanaWallet };