@dynamic-labs/solana-core 3.5.0 → 3.6.0

package/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+## [3.6.0](https://github.com/dynamic-labs/DynamicAuth/compare/v3.5.1...v3.6.0) (2024-11-07)
+
+
+### Features
+
+* Add a confirmation UI modal for signAllTransactions and signTransaction for Solana Embedded wallets. UI update to the embedded wallet confirmation UI modal.([#7381](https://github.com/dynamic-labs/DynamicAuth/issues/7381)) ([abac247](https://github.com/dynamic-labs/DynamicAuth/commit/abac247c53171dc05443ce20b4f152e5f25f27e5))
+
+
+### Bug Fixes
+
+* confirmation modal popup after send balance flow ([#7382](https://github.com/dynamic-labs/DynamicAuth/issues/7382)) ([72d5848](https://github.com/dynamic-labs/DynamicAuth/commit/72d5848be2466879f2b3efbaf5c13885752513b0))
+* network switch in global connectivity prevented publicClient call ([#7377](https://github.com/dynamic-labs/DynamicAuth/issues/7377)) ([a588497](https://github.com/dynamic-labs/DynamicAuth/commit/a5884978cbe3f875cef7560a004a0b127432ea9e))
+
+### [3.5.1](https://github.com/dynamic-labs/DynamicAuth/compare/v3.5.0...v3.5.1) (2024-11-05)
+
+
+### Features
+
+* allow passing connection config to solana wallet connectors ([#7364](https://github.com/dynamic-labs/DynamicAuth/issues/7364)) ([5dd5176](https://github.com/dynamic-labs/DynamicAuth/commit/5dd5176e6f91d9771ce1d1af031ab1adb25f5b74))
+
 ## [3.5.0](https://github.com/dynamic-labs/DynamicAuth/compare/v3.4.6...v3.5.0) (2024-11-05)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana-core",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -31,12 +31,12 @@
     "@solana/spl-token": "0.4.6"
   },
   "peerDependencies": {
-    "@dynamic-labs/assert-package-version": "3.5.0",
-    "@dynamic-labs/rpc-providers": "3.5.0",
-    "@dynamic-labs/types": "3.5.0",
-    "@dynamic-labs/utils": "3.5.0",
-    "@dynamic-labs/wallet-book": "3.5.0",
-    "@dynamic-labs/wallet-connector-core": "3.5.0",
+    "@dynamic-labs/assert-package-version": "3.6.0",
+    "@dynamic-labs/rpc-providers": "3.6.0",
+    "@dynamic-labs/types": "3.6.0",
+    "@dynamic-labs/utils": "3.6.0",
+    "@dynamic-labs/wallet-book": "3.6.0",
+    "@dynamic-labs/wallet-connector-core": "3.6.0",
     "eventemitter3": "5.0.1"
   }
 }

package/src/connector/SolanaWalletConnector.cjs

@@ -24,7 +24,8 @@ class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
         this.connectedChain = 'SOL';
         this.solNetworks = opts.solNetworks;
         this.chainRpcProviders = opts.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders();
+        this.connectionConfig = opts.connectionConfig;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
     }
     getNetwork() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -55,13 +56,13 @@ class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
         });
     }
     getWalletClient() {
-        var _a;
+        var _a, _b;
         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, 'confirmed');
+        return new web3_js.Connection(rpcUrl, (_b = this.connectionConfig) !== null && _b !== void 0 ? _b : 'confirmed');
     }
     getPublicClient() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/connector/SolanaWalletConnector.d.ts

@@ -1,4 +1,4 @@
-import { Connection } from '@solana/web3.js';
+import { Connection, ConnectionConfig } 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';
@@ -11,6 +11,7 @@ export type SolanaWalletConnectorOpts = {
     solNetworks: GenericNetwork[];
     walletBook: WalletBookSchema;
     metadata?: WalletMetadata;
+    connectionConfig?: ConnectionConfig;
 };
 export declare abstract class SolanaWalletConnector extends WalletConnectorBase<typeof SolanaWallet> implements IHardwareWalletConnector {
     isHardwareWalletEnabled: boolean;
@@ -19,6 +20,7 @@ export declare abstract class SolanaWalletConnector extends WalletConnectorBase<
     ChainWallet: typeof SolanaWallet;
     supportedChains: Chain[];
     connectedChain: Chain;
+    protected connectionConfig: ConnectionConfig | undefined;
     constructor(opts: SolanaWalletConnectorOpts);
     getNetwork(): Promise<string>;
     endSession(): Promise<void>;

package/src/connector/SolanaWalletConnector.js

@@ -20,7 +20,8 @@ class SolanaWalletConnector extends WalletConnectorBase {
         this.connectedChain = 'SOL';
         this.solNetworks = opts.solNetworks;
         this.chainRpcProviders = opts.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders();
+        this.connectionConfig = opts.connectionConfig;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -51,13 +52,13 @@ class SolanaWalletConnector extends WalletConnectorBase {
         });
     }
     getWalletClient() {
-        var _a;
+        var _a, _b;
         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, 'confirmed');
+        return new Connection(rpcUrl, (_b = this.connectionConfig) !== null && _b !== void 0 ? _b : 'confirmed');
     }
     getPublicClient() {
         return __awaiter(this, void 0, void 0, function* () {

package/src/rpc/RpcProviderSolana/RpcProviderSolana.cjs

@@ -9,14 +9,14 @@ rpcProviders.ChainRpcProviders.getSolanaProviderByChainId = (rpcProviders, chain
     const provider = (_a = rpcProviders['solana']) === null || _a === void 0 ? void 0 : _a.find((rpcProvider) => rpcProvider.chainId === chainId);
     return provider;
 };
-rpcProviders.ChainRpcProviders.registerSolanaProviders = () => {
+rpcProviders.ChainRpcProviders.registerSolanaProviders = (connectionConfig) => {
     rpcProviders.ChainRpcProviders.registerChainProviders(rpcProviders.ProviderChain.SOLANA, (config) => {
         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 provider = new web3_js.Connection(rpcUrl);
+                const provider = new web3_js.Connection(rpcUrl, connectionConfig);
                 return {
                     chainId: network.chainId.toString(),
                     chainName: network.name,

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

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

package/src/rpc/RpcProviderSolana/RpcProviderSolana.js

@@ -7,14 +7,14 @@ ChainRpcProviders.getSolanaProviderByChainId = (rpcProviders, chainId) => {
     const provider = (_a = rpcProviders['solana']) === null || _a === void 0 ? void 0 : _a.find((rpcProvider) => rpcProvider.chainId === chainId);
     return provider;
 };
-ChainRpcProviders.registerSolanaProviders = () => {
+ChainRpcProviders.registerSolanaProviders = (connectionConfig) => {
     ChainRpcProviders.registerChainProviders(ProviderChain.SOLANA, (config) => {
         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 provider = new Connection(rpcUrl);
+                const provider = new Connection(rpcUrl, connectionConfig);
                 return {
                     chainId: network.chainId.toString(),
                     chainName: network.name,

package/src/utils/SolanaUiTransaction/SolanaUiTransaction.cjs

@@ -10,16 +10,64 @@ var utils = require('@dynamic-labs/utils');
 
 const LAMPORTS_PER_SOL = 1000000000;
 class SolanaUiTransaction {
-    constructor({ onSubmit, from, connection, originalTransaction, }) {
+    constructor({ onSubmit, from, connection, multipleTransactions, }) {
         this.chain = 'SOL';
         this.data = undefined;
         this.fee = { gas: undefined };
-        this.feeDeducted = false;
         this.formatNonNativeToken = (value, decimals) => (Number(value) / Number(Math.pow(10, decimals))).toString();
         this.from = from;
         this.onSubmit = onSubmit;
         this.connection = connection;
-        this.originalTransaction = originalTransaction;
+        this.multipleTransactions = multipleTransactions;
+    }
+    fetchFee() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (this.fee.gas)
+                return;
+            let transactions = this.multipleTransactions;
+            // for send balance flow, create the transaction and then estimate it
+            if (!transactions) {
+                const tx = yield this.createTransactionSafe();
+                if (!tx)
+                    return;
+                transactions = tx instanceof Array ? tx : [tx];
+            }
+            const compiledMessages = transactions.map((tx) => 'version' in tx ? tx.message : tx.compileMessage());
+            if (compiledMessages.some((msg) => !msg)) {
+                throw new Error('Invalid transaction');
+            }
+            const getFeeWithRetry = (message) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                let res = yield this.connection.getFeeForMessage(message);
+                let retryCount = 0;
+                while (res.value === null && retryCount < 5) {
+                    res = yield this.connection.getFeeForMessage(message);
+                    retryCount++;
+                }
+                return res.value ? BigInt(res.value) : BigInt(0);
+            });
+            const fees = yield Promise.all(compiledMessages.map((message) => getFeeWithRetry(message)));
+            this.fee.gas = fees.reduce((acc, fee) => acc + fee, BigInt(0));
+            if (this.fee.gas === BigInt(0)) {
+                this.fee.gas = undefined;
+            }
+        });
+    }
+    // if one of the transactions is not sponsored,
+    // then the simulation will have a solana transfer in it if it was successful
+    isGasSponsored() {
+        var _a;
+        if (!((_a = this.multipleTransactions) === null || _a === void 0 ? void 0 : _a.length))
+            return false;
+        return this.multipleTransactions.every((tx) => {
+            var _a;
+            if ('version' in tx) {
+                return this.from !== tx.message.staticAccountKeys[0].toBase58();
+            }
+            if ('feePayer' in tx) {
+                return this.from !== ((_a = tx.feePayer) === null || _a === void 0 ? void 0 : _a.toBase58());
+            }
+            return false;
+        });
     }
     parse(input) {
         const floatValue = parseFloat(input);
@@ -40,7 +88,11 @@ class SolanaUiTransaction {
     }
     submit() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const sendTransaction = yield this.createTransaction();
+            if (this.multipleTransactions) {
+                return this.onSubmit();
+            }
+            // send balance modal transactions
+            const sendTransaction = (yield this.createTransaction());
             return this.onSubmit(sendTransaction);
         });
     }
@@ -57,37 +109,6 @@ class SolanaUiTransaction {
         }
         return /^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(address);
     }
-    fetchFee() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.fee.gas)
-                return;
-            const transaction = yield this.createTransactionSafe();
-            if (!transaction) {
-                return;
-            }
-            let compiledMessage;
-            if ('version' in transaction) {
-                compiledMessage = transaction.message;
-            }
-            else {
-                compiledMessage = transaction.compileMessage();
-            }
-            if (!compiledMessage) {
-                throw new Error('Invalid transaction');
-            }
-            let res = yield this.connection.getFeeForMessage(compiledMessage);
-            let retryCount = 0;
-            while (res.value === null && retryCount < 5) {
-                res = yield this.connection.getFeeForMessage(compiledMessage);
-                retryCount++;
-            }
-            this.fee.gas = res.value ? BigInt(res.value) : undefined;
-            if (!this.feeDeducted && this.fee.gas && this.value) {
-                this.value = this.value - this.fee.gas;
-                this.feeDeducted = true;
-            }
-        });
-    }
     createTransaction() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -95,8 +116,8 @@ class SolanaUiTransaction {
             if (!to) {
                 throw new Error('Destination is required');
             }
-            if (this.originalTransaction) {
-                return this.originalTransaction;
+            if (this.multipleTransactions) {
+                return this.multipleTransactions;
             }
             const sendTransaction = new web3_js.Transaction();
             const fromPubkey = new web3_js.PublicKey(this.from);

package/src/utils/SolanaUiTransaction/SolanaUiTransaction.d.ts

@@ -4,11 +4,10 @@ export declare const LAMPORTS_PER_SOL = 1000000000;
 type SolanaUiTransactionProps = {
     from: string;
     connection: Connection;
-    onSubmit: (transaction: Transaction | VersionedTransaction) => Promise<string>;
-    originalTransaction?: Transaction | VersionedTransaction;
+    onSubmit: (transaction?: Transaction | VersionedTransaction) => Promise<any>;
+    multipleTransactions?: (Transaction | VersionedTransaction)[];
 };
 export declare class SolanaUiTransaction implements IUITransaction {
-    notEnoughFundsError: boolean | undefined;
     to: string | undefined;
     from: string;
     value: bigint | undefined;
@@ -18,22 +17,23 @@ export declare class SolanaUiTransaction implements IUITransaction {
     fee: {
         gas: bigint | undefined;
     };
-    originalTransaction: Transaction | VersionedTransaction | undefined;
-    feeDeducted: boolean;
+    multipleTransactions?: (Transaction | VersionedTransaction)[];
     nonNativeAddress?: string;
     nonNativeDecimal?: number;
     nonNativeValue?: bigint;
     private onSubmit;
     private connection;
-    constructor({ onSubmit, from, connection, originalTransaction, }: SolanaUiTransactionProps);
+    constructor({ onSubmit, from, connection, multipleTransactions, }: SolanaUiTransactionProps);
+    nativePrice?: number | undefined;
+    fetchFee(): Promise<void>;
+    isGasSponsored(): boolean;
     parse(input: string): bigint;
     parseNonNativeToken(input: string, decimals: number): bigint;
     formatNonNativeToken: (value: bigint, decimals: number) => string;
     format(value: bigint, { precision }?: IUITransactionFormatOptions): string;
-    submit(): Promise<string>;
+    submit(): Promise<any>;
     getBalance(): Promise<bigint>;
     validateAddressFormat(address: string): boolean;
-    fetchFee(): Promise<void>;
     private createTransaction;
     private createTransactionSafe;
 }

package/src/utils/SolanaUiTransaction/SolanaUiTransaction.js

@@ -6,16 +6,64 @@ import { formatNumberText } from '@dynamic-labs/utils';
 
 const LAMPORTS_PER_SOL = 1000000000;
 class SolanaUiTransaction {
-    constructor({ onSubmit, from, connection, originalTransaction, }) {
+    constructor({ onSubmit, from, connection, multipleTransactions, }) {
         this.chain = 'SOL';
         this.data = undefined;
         this.fee = { gas: undefined };
-        this.feeDeducted = false;
         this.formatNonNativeToken = (value, decimals) => (Number(value) / Number(Math.pow(10, decimals))).toString();
         this.from = from;
         this.onSubmit = onSubmit;
         this.connection = connection;
-        this.originalTransaction = originalTransaction;
+        this.multipleTransactions = multipleTransactions;
+    }
+    fetchFee() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.fee.gas)
+                return;
+            let transactions = this.multipleTransactions;
+            // for send balance flow, create the transaction and then estimate it
+            if (!transactions) {
+                const tx = yield this.createTransactionSafe();
+                if (!tx)
+                    return;
+                transactions = tx instanceof Array ? tx : [tx];
+            }
+            const compiledMessages = transactions.map((tx) => 'version' in tx ? tx.message : tx.compileMessage());
+            if (compiledMessages.some((msg) => !msg)) {
+                throw new Error('Invalid transaction');
+            }
+            const getFeeWithRetry = (message) => __awaiter(this, void 0, void 0, function* () {
+                let res = yield this.connection.getFeeForMessage(message);
+                let retryCount = 0;
+                while (res.value === null && retryCount < 5) {
+                    res = yield this.connection.getFeeForMessage(message);
+                    retryCount++;
+                }
+                return res.value ? BigInt(res.value) : BigInt(0);
+            });
+            const fees = yield Promise.all(compiledMessages.map((message) => getFeeWithRetry(message)));
+            this.fee.gas = fees.reduce((acc, fee) => acc + fee, BigInt(0));
+            if (this.fee.gas === BigInt(0)) {
+                this.fee.gas = undefined;
+            }
+        });
+    }
+    // if one of the transactions is not sponsored,
+    // then the simulation will have a solana transfer in it if it was successful
+    isGasSponsored() {
+        var _a;
+        if (!((_a = this.multipleTransactions) === null || _a === void 0 ? void 0 : _a.length))
+            return false;
+        return this.multipleTransactions.every((tx) => {
+            var _a;
+            if ('version' in tx) {
+                return this.from !== tx.message.staticAccountKeys[0].toBase58();
+            }
+            if ('feePayer' in tx) {
+                return this.from !== ((_a = tx.feePayer) === null || _a === void 0 ? void 0 : _a.toBase58());
+            }
+            return false;
+        });
     }
     parse(input) {
         const floatValue = parseFloat(input);
@@ -36,7 +84,11 @@ class SolanaUiTransaction {
     }
     submit() {
         return __awaiter(this, void 0, void 0, function* () {
-            const sendTransaction = yield this.createTransaction();
+            if (this.multipleTransactions) {
+                return this.onSubmit();
+            }
+            // send balance modal transactions
+            const sendTransaction = (yield this.createTransaction());
             return this.onSubmit(sendTransaction);
         });
     }
@@ -53,37 +105,6 @@ class SolanaUiTransaction {
         }
         return /^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(address);
     }
-    fetchFee() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.fee.gas)
-                return;
-            const transaction = yield this.createTransactionSafe();
-            if (!transaction) {
-                return;
-            }
-            let compiledMessage;
-            if ('version' in transaction) {
-                compiledMessage = transaction.message;
-            }
-            else {
-                compiledMessage = transaction.compileMessage();
-            }
-            if (!compiledMessage) {
-                throw new Error('Invalid transaction');
-            }
-            let res = yield this.connection.getFeeForMessage(compiledMessage);
-            let retryCount = 0;
-            while (res.value === null && retryCount < 5) {
-                res = yield this.connection.getFeeForMessage(compiledMessage);
-                retryCount++;
-            }
-            this.fee.gas = res.value ? BigInt(res.value) : undefined;
-            if (!this.feeDeducted && this.fee.gas && this.value) {
-                this.value = this.value - this.fee.gas;
-                this.feeDeducted = true;
-            }
-        });
-    }
     createTransaction() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -91,8 +112,8 @@ class SolanaUiTransaction {
             if (!to) {
                 throw new Error('Destination is required');
             }
-            if (this.originalTransaction) {
-                return this.originalTransaction;
+            if (this.multipleTransactions) {
+                return this.multipleTransactions;
             }
             const sendTransaction = new Transaction();
             const fromPubkey = new PublicKey(this.from);