@dynamic-labs/solana-core 4.0.0-alpha.8 → 4.0.0

package/src/connector/{SolWalletConnector.d.ts → SolanaWalletConnector.d.ts}

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

package/src/connector/{SolWalletConnector.js → SolanaWalletConnector.js}

@@ -3,13 +3,12 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import { PublicKey, Connection, Transaction, TransactionInstruction } from '@solana/web3.js';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError, isLedgerAddressViaVerifiedCredentials, NotSupportedError } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { SolanaWallet } from '../wallet/SolanaWallet.js';
 import { extractNonce } from '../utils/extractNonce/extractNonce.js';
 import { getGenesisHashLSKey } from '../utils/getGenesisHashLSKey/getGenesisHashLSKey.js';
 
 const MEMO_PROGRAM_ID = new PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
-class SolWalletConnector extends WalletConnectorBase {
+class SolanaWalletConnector extends WalletConnectorBase {
     constructor(opts) {
         var _a;
         super(opts);
@@ -20,7 +19,8 @@ class SolWalletConnector 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 +51,13 @@ class SolWalletConnector 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* () {
@@ -88,10 +88,8 @@ class SolWalletConnector extends WalletConnectorBase {
         return lamports / 1000000000;
     }
     canConnectWithHardwareWallet() {
-        const wallet = findWalletBookWallet(this.walletBook, this.key);
-        if (!wallet || !wallet.hardwareWallets)
-            return false;
-        return wallet.hardwareWallets.includes('ledger');
+        var _a;
+        return Boolean((_a = this.metadata.supportedHardwareWallets) === null || _a === void 0 ? void 0 : _a.includes('ledger'));
     }
     signMessage(messageToSign) {
         const _super = Object.create(null, {
@@ -168,4 +166,4 @@ class SolWalletConnector extends WalletConnectorBase {
     }
 }
 
-export { SolWalletConnector };
+export { SolanaWalletConnector };

package/src/connector/index.d.ts

@@ -1 +1 @@
-export * from './SolWalletConnector';
+export * from './SolanaWalletConnector';

package/src/index.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var assertPackageVersion = require('@dynamic-labs/assert-package-version');
 var _package = require('../package.cjs');
-var SolWalletConnector = require('./connector/SolWalletConnector.cjs');
+var SolanaWalletConnector = require('./connector/SolanaWalletConnector.cjs');
 require('./rpc/RpcProviderSolana/RpcProviderSolana.cjs');
 var rpcProviders = require('@dynamic-labs/rpc-providers');
 var solanaProvidersSelector = require('./rpc/solanaProvidersSelector/solanaProvidersSelector.cjs');
@@ -14,6 +14,7 @@ var decodeTransactionFromBase64 = require('./utils/decodeTransactionFromBase64/d
 var isVersionedTransaction = require('./utils/isVersionedTransaction/isVersionedTransaction.cjs');
 var encodeTransactionToBase64 = require('./utils/encodeTransactionToBase64/encodeTransactionToBase64.cjs');
 var getGenesisHashLSKey = require('./utils/getGenesisHashLSKey/getGenesisHashLSKey.cjs');
+var isTransactionSigned = require('./utils/isTransactionSigned/isTransactionSigned.cjs');
 var SolanaWallet = require('./wallet/SolanaWallet.cjs');
 var isSolanaWallet = require('./wallet/isSolanaWallet/isSolanaWallet.cjs');
 var isLedgerSolanaWallet = require('./wallet/isLedgerSolanaWallet/isLedgerSolanaWallet.cjs');
@@ -21,13 +22,14 @@ var constants = require('./constants.cjs');
 
 assertPackageVersion.assertPackageVersion('@dynamic-labs/solana-core', _package.version);
 
-exports.SolWalletConnector = SolWalletConnector.SolWalletConnector;
+exports.SolanaWalletConnector = SolanaWalletConnector.SolanaWalletConnector;
 exports.solanaProvidersSelector = solanaProvidersSelector.solanaProvidersSelector;
 exports.SolanaUiTransaction = SolanaUiTransaction.SolanaUiTransaction;
 exports.decodeTransactionFromBase64 = decodeTransactionFromBase64.decodeTransactionFromBase64;
 exports.isVersionedTransaction = isVersionedTransaction.isVersionedTransaction;
 exports.encodeTransactionToBase64 = encodeTransactionToBase64.encodeTransactionToBase64;
 exports.getGenesisHashLSKey = getGenesisHashLSKey.getGenesisHashLSKey;
+exports.isTxAlreadySigned = isTransactionSigned.isTxAlreadySigned;
 exports.SolanaWallet = SolanaWallet.SolanaWallet;
 exports.isSolanaWallet = isSolanaWallet.isSolanaWallet;
 exports.isLedgerSolanaWallet = isLedgerSolanaWallet.isLedgerSolanaWallet;

package/src/index.js

@@ -1,7 +1,7 @@
 'use client'
 import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
 import { version } from '../package.js';
-export { SolWalletConnector } from './connector/SolWalletConnector.js';
+export { SolanaWalletConnector } from './connector/SolanaWalletConnector.js';
 import './rpc/RpcProviderSolana/RpcProviderSolana.js';
 export * from '@dynamic-labs/rpc-providers';
 export { solanaProvidersSelector } from './rpc/solanaProvidersSelector/solanaProvidersSelector.js';
@@ -10,6 +10,7 @@ export { decodeTransactionFromBase64 } from './utils/decodeTransactionFromBase64
 export { isVersionedTransaction } from './utils/isVersionedTransaction/isVersionedTransaction.js';
 export { encodeTransactionToBase64 } from './utils/encodeTransactionToBase64/encodeTransactionToBase64.js';
 export { getGenesisHashLSKey } from './utils/getGenesisHashLSKey/getGenesisHashLSKey.js';
+export { isTxAlreadySigned } from './utils/isTransactionSigned/isTransactionSigned.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

@@ -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,69 @@ 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 = yield Promise.all(transactions.map((tx) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                if ('version' in tx) {
+                    return tx.message;
+                }
+                return 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, 'confirmed');
+                let retryCount = 0;
+                while (res.value === null && retryCount < 5) {
+                    res = yield this.connection.getFeeForMessage(message, 'confirmed');
+                    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 +93,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 +114,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 +121,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,69 @@ 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 = yield Promise.all(transactions.map((tx) => __awaiter(this, void 0, void 0, function* () {
+                if ('version' in tx) {
+                    return tx.message;
+                }
+                return 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, 'confirmed');
+                let retryCount = 0;
+                while (res.value === null && retryCount < 5) {
+                    res = yield this.connection.getFeeForMessage(message, 'confirmed');
+                    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 +89,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 +110,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 +117,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);

package/src/utils/index.d.ts

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

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

@@ -0,0 +1 @@
+export * from './isTransactionSigned';

package/src/utils/isTransactionSigned/isTransactionSigned.cjs

@@ -0,0 +1,17 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isTxAlreadySigned = (transaction) => {
+    let alreadySigned = false;
+    if ('version' in transaction) {
+        alreadySigned = transaction.signatures.some((sig) => !sig.every((byte) => byte === 0));
+    }
+    else {
+        alreadySigned = transaction.signatures.some((sig) => sig.signature);
+    }
+    return alreadySigned;
+};
+
+exports.isTxAlreadySigned = isTxAlreadySigned;

package/src/utils/isTransactionSigned/isTransactionSigned.d.ts

@@ -0,0 +1,2 @@
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
+export declare const isTxAlreadySigned: (transaction: Transaction | VersionedTransaction) => boolean;

package/src/utils/isTransactionSigned/isTransactionSigned.js

@@ -0,0 +1,13 @@
+'use client'
+const isTxAlreadySigned = (transaction) => {
+    let alreadySigned = false;
+    if ('version' in transaction) {
+        alreadySigned = transaction.signatures.some((sig) => !sig.every((byte) => byte === 0));
+    }
+    else {
+        alreadySigned = transaction.signatures.some((sig) => sig.signature);
+    }
+    return alreadySigned;
+};
+
+export { isTxAlreadySigned };

package/src/wallet/SolanaWallet.cjs

@@ -4,10 +4,38 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
+var web3_js = require('@solana/web3.js');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 
 class SolanaWallet extends walletConnectorCore.Wallet {
+    /**
+     * Sends the native balance of the wallet to the given address.
+     * @param amount - The amount of balance to send (in SOL).
+     * @param toAddress - The address to send the balance to.
+     * @returns The signature of the sent transaction.
+     */
+    sendBalance(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ amount, toAddress, }) {
+            const connection = yield this.getConnection();
+            const signer = yield this.getSigner();
+            const { blockhash } = yield connection.getLatestBlockhash('finalized');
+            const message = new web3_js.TransactionMessage({
+                instructions: [
+                    web3_js.SystemProgram.transfer({
+                        fromPubkey: new web3_js.PublicKey(this.address),
+                        lamports: utils.solToLamports(Number(amount)),
+                        toPubkey: new web3_js.PublicKey(toAddress),
+                    }),
+                ],
+                payerKey: new web3_js.PublicKey(this.address),
+                recentBlockhash: blockhash,
+            }).compileToV0Message();
+            const transaction = new web3_js.VersionedTransaction(message);
+            const { signature } = yield signer.signAndSendTransaction(transaction);
+            return signature;
+        });
+    }
     /**
      * Retrieves the RPC connection
      * @returns A promise that resolves to the RPC connection

package/src/wallet/SolanaWallet.d.ts

@@ -1,8 +1,18 @@
 import { Connection } from '@solana/web3.js';
 import { Wallet } from '@dynamic-labs/wallet-connector-core';
-import { SolWalletConnector } from '../connector';
+import { SolanaWalletConnector } from '../connector';
 import { ISolana } from '../types';
-export declare class SolanaWallet extends Wallet<SolWalletConnector> {
+export declare class SolanaWallet extends Wallet<SolanaWalletConnector> {
+    /**
+     * Sends the native balance of the wallet to the given address.
+     * @param amount - The amount of balance to send (in SOL).
+     * @param toAddress - The address to send the balance to.
+     * @returns The signature of the sent transaction.
+     */
+    sendBalance({ amount, toAddress, }: {
+        amount: string;
+        toAddress: string;
+    }): Promise<string | undefined>;
     /**
      * Retrieves the RPC connection
      * @returns A promise that resolves to the RPC connection

package/src/wallet/SolanaWallet.js

@@ -1,9 +1,37 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
+import { TransactionMessage, SystemProgram, PublicKey, VersionedTransaction } from '@solana/web3.js';
 import { Wallet, logger } from '@dynamic-labs/wallet-connector-core';
-import { cloneObjectWithOverrides } from '@dynamic-labs/utils';
+import { solToLamports, cloneObjectWithOverrides } from '@dynamic-labs/utils';
 
 class SolanaWallet extends Wallet {
+    /**
+     * Sends the native balance of the wallet to the given address.
+     * @param amount - The amount of balance to send (in SOL).
+     * @param toAddress - The address to send the balance to.
+     * @returns The signature of the sent transaction.
+     */
+    sendBalance(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ amount, toAddress, }) {
+            const connection = yield this.getConnection();
+            const signer = yield this.getSigner();
+            const { blockhash } = yield connection.getLatestBlockhash('finalized');
+            const message = new TransactionMessage({
+                instructions: [
+                    SystemProgram.transfer({
+                        fromPubkey: new PublicKey(this.address),
+                        lamports: solToLamports(Number(amount)),
+                        toPubkey: new PublicKey(toAddress),
+                    }),
+                ],
+                payerKey: new PublicKey(this.address),
+                recentBlockhash: blockhash,
+            }).compileToV0Message();
+            const transaction = new VersionedTransaction(message);
+            const { signature } = yield signer.signAndSendTransaction(transaction);
+            return signature;
+        });
+    }
     /**
      * Retrieves the RPC connection
      * @returns A promise that resolves to the RPC connection