@dynamic-labs/embedded-wallet-solana 4.0.0-alpha.3 → 4.0.0-alpha.31

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.cjs

@@ -6,7 +6,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
 var webauthnStamper = require('@turnkey/webauthn-stamper');
-var http = require('@turnkey/http');
 var solana = require('@turnkey/solana');
 var iframeStamper = require('@turnkey/iframe-stamper');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
@@ -14,7 +13,6 @@ var utils = require('@dynamic-labs/utils');
 var solanaCore = require('@dynamic-labs/solana-core');
 var embeddedWallet = require('@dynamic-labs/embedded-wallet');
 var createSolanaConnection = require('../utils/createSolanaConnection/createSolanaConnection.cjs');
-var transactionDecoder = require('../utils/transactionDecoder/transactionDecoder.cjs');
 var api = require('../utils/api/api.cjs');
 var TurnkeySolanaSigner = require('./TurnkeySolanaSigner.cjs');
 
@@ -44,17 +42,13 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             }
             throw new Error('Failed to get environment id');
         };
-        this.stampCreateWalletAccountRequest = (_b) => _tslib.__awaiter(this, [_b], void 0, function* ({ request, }) {
-            yield this.createOrRestoreSession();
-            const turnkeyClient = this.getTurnkeyClient();
-            return turnkeyClient.stampCreateWalletAccounts(request);
-        });
         this.solNetworks = props.solNetworks;
         this.walletUiUtils = props.walletUiUtils;
         this._turnkeyAccount = undefined;
         this._connectionClient = undefined;
+        this.connectionConfig = props.connectionConfig;
         this.chainRpcProviders = props.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders();
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
         this.__turnkeyClient = this.getTurnkeyClient();
     }
     getRpcUrl() {
@@ -70,7 +64,9 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             const rpcUrl = this.getRpcUrl();
             if (!rpcUrl)
                 throw new utils.DynamicError('No rpcUrl');
-            this._connectionClient = createSolanaConnection.createSolanaConnection(rpcUrl, commitmentOrConfig);
+            const config = typeof commitmentOrConfig === 'string'
+                ? Object.assign(Object.assign({}, this.connectionConfig), { commitment: commitmentOrConfig }) : Object.assign(Object.assign({}, this.connectionConfig), commitmentOrConfig);
+            this._connectionClient = createSolanaConnection.createSolanaConnection(rpcUrl, config);
         }
         return this._connectionClient;
     }
@@ -159,23 +155,6 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             return this.getTurnkeyAccount();
         });
     }
-    getTurnkeyClient() {
-        var _a;
-        let rpId = utils.getTLD();
-        if (!rpId) {
-            rpId = utils.PlatformService.getHostname();
-        }
-        const passkeyStamper = embeddedWallet.PasskeyService.createWebauthnStamper({
-            rpId,
-        });
-        const apiKeyStamper = embeddedWallet.TurnkeyWalletConnectorBase === null || embeddedWallet.TurnkeyWalletConnectorBase === void 0 ? void 0 : embeddedWallet.TurnkeyWalletConnectorBase.apiKeyStamper;
-        const stamper = apiKeyStamper !== null && apiKeyStamper !== void 0 ? apiKeyStamper : passkeyStamper;
-        this.__turnkeyClient =
-            (_a = this.getAuthenticatorHandler().client) !== null && _a !== void 0 ? _a : new http.TurnkeyClient({
-                baseUrl: embeddedWallet.TURNKEY_API_BASE_URL,
-            }, stamper);
-        return this.__turnkeyClient;
-    }
     createTurnkeyAccount(_a) {
         return _tslib.__awaiter(this, arguments, void 0, function* ({ organizationId, }) {
             const turnkeyClient = this.getTurnkeyClient();
@@ -260,7 +239,7 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             return utils.bufferToBase64(signedRawMessage);
         });
     }
-    signTransaction(transaction) {
+    internalSignTransaction(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             yield this.createOrRestoreSession();
             let account = yield this.getTurnkeyAccount();
@@ -288,27 +267,84 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             return transaction;
         });
     }
-    internalSignAndSendTransaction(transaction, options) {
+    signTransaction(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (!this.turnkeyAddress)
-                throw new utils.DynamicError('Solana wallet not found');
-            const currentConnection = this.getConnection('confirmed');
-            const blockhash = yield currentConnection.getLatestBlockhash();
-            if ('version' in transaction) {
-                transaction.message.recentBlockhash =
-                    blockhash.blockhash;
+                throw new utils.DynamicError('No turnkey account');
+            const uiTransaction = new solanaCore.SolanaUiTransaction({
+                connection: this.getConnection(),
+                from: this.turnkeyAddress,
+                multipleTransactions: [transaction],
+                onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignTransaction(transaction); }),
+            });
+            return this.walletUiUtils.signTransaction(this, uiTransaction);
+        });
+    }
+    createUiTransaction(from) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
+            const transaction = new solanaCore.SolanaUiTransaction({
+                connection: this.getConnection(),
+                from,
+                onSubmit: (transaction) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    if (!transaction)
+                        return undefined;
+                    return this.internalSignAndSendTransaction(transaction);
+                }),
+            });
+            return transaction;
+        });
+    }
+    internalSignAllTransactions(transactions) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.createOrRestoreSession();
+            let account = yield this.getTurnkeyAccount();
+            const address = this.turnkeyAddress;
+            if (!account || !address) {
+                throw new Error('No turnkey account');
             }
-            else {
-                transaction.recentBlockhash = blockhash.blockhash;
-                transaction.feePayer =
-                    (_a = transaction.feePayer) !== null && _a !== void 0 ? _a : new web3_js.PublicKey(this.turnkeyAddress);
+            try {
+                const signedTransactions = yield account.signAllTransactions(transactions, address);
+                return signedTransactions;
+            }
+            catch (err) {
+                if (embeddedWallet.TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS.some((errorMsg) => err.message.includes(errorMsg))) {
+                    yield this.removeSessionKeys();
+                    yield this.createOrRestoreSession({
+                        ignoreRestore: true,
+                    });
+                    account = (yield this.getTurnkeyAccount());
+                    const signedTransactions = yield account.signAllTransactions(transactions, address);
+                    return signedTransactions;
+                }
+                else {
+                    embeddedWallet.logger.error('[TK] failed to perform SignAllTransactions activity', err);
+                    throw err;
+                }
             }
-            const signedTransaction = yield this.signTransaction(transaction);
-            const signature = yield currentConnection.sendRawTransaction(Buffer.from(signedTransaction.serialize({
-                requireAllSignatures: false,
-                verifySignatures: false,
-            })), options);
+        });
+    }
+    signAllTransactions(transactions) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!this.turnkeyAddress)
+                throw new utils.DynamicError('No turnkey account');
+            const uiTransaction = new solanaCore.SolanaUiTransaction({
+                connection: this.getConnection(),
+                from: this.turnkeyAddress,
+                multipleTransactions: transactions,
+                onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignAllTransactions(transactions); }),
+            });
+            return this.walletUiUtils.signTransaction(this, uiTransaction);
+        });
+    }
+    internalSignAndSendTransaction(transaction, options) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (!this.turnkeyAddress)
+                throw new utils.DynamicError('Solana wallet not found');
+            const currentConnection = this.getConnection((_b = (_a = this.connectionConfig) === null || _a === void 0 ? void 0 : _a.commitment) !== null && _b !== void 0 ? _b : 'confirmed');
+            const signedTransaction = yield this.internalSignTransaction(transaction);
+            const signature = yield currentConnection.sendRawTransaction(signedTransaction.serialize(), options);
             // listen for tx confirmation until 60 seconds, which is ~150 blocks expiration
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
@@ -328,44 +364,15 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
     }
     signAndSendTransaction(transaction, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (!this.turnkeyAddress)
                 throw new utils.DynamicError('Solana wallet not found');
-            let optimizedTransaction = transaction;
-            try {
-                if ((yield this.getNetwork()) === 'mainnet') {
-                    optimizedTransaction = (yield api.optimizeSolanaTransaction(this.getEnvId(), transaction, (_a = this.turnkeyAddress) !== null && _a !== void 0 ? _a : ''));
-                }
-            }
-            catch (e) {
-                embeddedWallet.logger.warn('Failed to optimize transaction', e);
-            }
-            const transactionsData = yield transactionDecoder.decodeTransaction(optimizedTransaction, this.getConnection(), this.turnkeyAddress);
-            if (!(transactionsData === null || transactionsData === void 0 ? void 0 : transactionsData.length)) {
-                throw new utils.DynamicError('Incorrectly formatted transaction instructions');
-            }
-            let spent;
-            let insufficientFunds = false;
-            try {
-                spent = yield transactionDecoder.getTotalSolanaSpend(optimizedTransaction, this.getConnection(), this.turnkeyAddress);
-            }
-            catch (e) {
-                if (e.message === 'Insufficient funds') {
-                    insufficientFunds = true;
-                }
-            }
-            const to = transactionDecoder.summarizeTransactionDecodedData(transactionsData);
+            const optimizedTransaction = yield this.optimizeTransaction(transaction);
             const uiTransaction = new solanaCore.SolanaUiTransaction({
                 connection: this.getConnection(),
                 from: this.turnkeyAddress,
+                multipleTransactions: [optimizedTransaction],
                 onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignAndSendTransaction(optimizedTransaction, options); }),
-                originalTransaction: optimizedTransaction,
             });
-            uiTransaction.to = to;
-            uiTransaction.value = spent;
-            if (insufficientFunds) {
-                uiTransaction.notEnoughFundsError = true;
-            }
             // TODO: remove this. We should not be passing references to wallet connectors
             return this.walletUiUtils.sendTransaction(this, uiTransaction);
         });
@@ -408,16 +415,27 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
     lamportsToSol(lamports) {
         return lamports / web3_js.LAMPORTS_PER_SOL;
     }
-    createUiTransaction(from) {
+    optimizeTransaction(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.validateActiveWallet(from);
-            const transaction = new solanaCore.SolanaUiTransaction({
-                connection: this.getConnection(),
-                from,
-                onSubmit: (transaction) => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignAndSendTransaction(transaction); }),
-            });
-            transaction.feeDeducted = true;
-            return transaction;
+            var _a;
+            let optimizedTransaction = 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);
+            }
+            try {
+                // we cannot optimize partially signed transactions as once a tx is modified the signatures are no longer valid
+                if ((yield this.getNetwork()) === 'mainnet' && !alreadySigned) {
+                    optimizedTransaction = (yield api.optimizeSolanaTransaction(this.getEnvId(), transaction, (_a = this.turnkeyAddress) !== null && _a !== void 0 ? _a : ''));
+                }
+            }
+            catch (e) {
+                embeddedWallet.logger.warn('Failed to optimize transaction', e);
+            }
+            return optimizedTransaction;
         });
     }
 }

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.d.ts

@@ -1,5 +1,4 @@
 import { Commitment, Connection, ConnectionConfig, Transaction, VersionedTransaction, ConfirmOptions, Signer, SendOptions } from '@solana/web3.js';
-import { TurnkeyApiTypes } from '@turnkey/http';
 import { GenericNetwork, IUITransaction, WalletUiUtils } from '@dynamic-labs/types';
 import { Chain, ISendBalanceWalletConnector, InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
@@ -16,6 +15,7 @@ export type TurnkeySolanaConnectorProps = {
     solNetworks: GenericNetwork[];
     appName?: string;
     chainRpcProviders: IChainRpcProviders;
+    connectionConfig?: ConnectionConfig;
 };
 export declare class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase implements ISendBalanceWalletConnector {
     ChainWallet: typeof SolanaWallet;
@@ -26,7 +26,7 @@ export declare class TurnkeySolanaWalletConnector extends TurnkeyWalletConnector
     private walletUiUtils;
     private _turnkeyAccount;
     private _connectionClient;
-    private __turnkeyClient;
+    private connectionConfig;
     constructor(nameAndKey: TurnkeyWalletConnectorNameAndKey, props: TurnkeySolanaConnectorProps);
     getRpcUrl(): string;
     getConnection(commitmentOrConfig?: Commitment | ConnectionConfig): Connection;
@@ -39,7 +39,6 @@ export declare class TurnkeySolanaWalletConnector extends TurnkeyWalletConnector
     getAccount(): string | undefined;
     endSession(): Promise<void>;
     private refreshTurnkeyAccount;
-    private getTurnkeyClient;
     private createTurnkeyAccount;
     private getTurnkeyAccount;
     getSigner(): Promise<TurnkeySolanaSigner | undefined>;
@@ -47,14 +46,15 @@ export declare class TurnkeySolanaWalletConnector extends TurnkeyWalletConnector
     signUint8ArrayMessage(encodedMessage: Uint8Array): Promise<Uint8Array>;
     getEnvId: () => any;
     signMessage(messageToSign: string): Promise<string | undefined>;
+    internalSignTransaction<T extends Transaction | VersionedTransaction>(transaction: T): Promise<T>;
     signTransaction<T extends Transaction | VersionedTransaction>(transaction: T): Promise<T>;
+    createUiTransaction(from: string): Promise<IUITransaction>;
+    internalSignAllTransactions<T extends Transaction | VersionedTransaction>(transactions: T[]): Promise<T[]>;
+    signAllTransactions<T extends Transaction | VersionedTransaction>(transactions: T[]): Promise<T[]>;
     internalSignAndSendTransaction<T extends Transaction | VersionedTransaction>(transaction: T, options?: SendOptions): Promise<string>;
     signAndSendTransaction<T extends Transaction | VersionedTransaction>(transaction: T, options?: SendOptions): Promise<string>;
     sendTransaction<T extends Transaction | VersionedTransaction>(transaction: T, connection: Connection, options?: SendTransactionOptions): Promise<string>;
     private lamportsToSol;
-    createUiTransaction(from: string): Promise<IUITransaction>;
-    stampCreateWalletAccountRequest: ({ request, }: {
-        request: TurnkeyApiTypes['v1CreateWalletAccountsRequest'];
-    }) => Promise<import("@turnkey/http").TSignedRequest>;
+    private optimizeTransaction;
 }
 export {};

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.js

@@ -2,15 +2,13 @@
 import { __awaiter, __rest } from '../../../_virtual/_tslib.js';
 import { LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js';
 import { WebauthnStamper } from '@turnkey/webauthn-stamper';
-import { TurnkeyClient } from '@turnkey/http';
 import { TurnkeySigner } from '@turnkey/solana';
 import { IframeStamper } from '@turnkey/iframe-stamper';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
-import { DynamicError, getTLD, PlatformService, bufferToBase64 } from '@dynamic-labs/utils';
+import { DynamicError, bufferToBase64 } from '@dynamic-labs/utils';
 import { SolanaWallet, ProviderChain, getGenesisHashLSKey, SolanaUiTransaction } from '@dynamic-labs/solana-core';
-import { TurnkeyWalletConnectorBase, findTurnkeyVerifiedCredentials, PasskeyService, TURNKEY_API_BASE_URL, TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS, logger } from '@dynamic-labs/embedded-wallet';
+import { TurnkeyWalletConnectorBase, findTurnkeyVerifiedCredentials, TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS, logger } from '@dynamic-labs/embedded-wallet';
 import { createSolanaConnection } from '../utils/createSolanaConnection/createSolanaConnection.js';
-import { decodeTransaction, getTotalSolanaSpend, summarizeTransactionDecodedData } from '../utils/transactionDecoder/transactionDecoder.js';
 import { optimizeSolanaTransaction } from '../utils/api/api.js';
 import { TurnkeySolanaSigner } from './TurnkeySolanaSigner.js';
 
@@ -40,17 +38,13 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             }
             throw new Error('Failed to get environment id');
         };
-        this.stampCreateWalletAccountRequest = (_b) => __awaiter(this, [_b], void 0, function* ({ request, }) {
-            yield this.createOrRestoreSession();
-            const turnkeyClient = this.getTurnkeyClient();
-            return turnkeyClient.stampCreateWalletAccounts(request);
-        });
         this.solNetworks = props.solNetworks;
         this.walletUiUtils = props.walletUiUtils;
         this._turnkeyAccount = undefined;
         this._connectionClient = undefined;
+        this.connectionConfig = props.connectionConfig;
         this.chainRpcProviders = props.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders();
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
         this.__turnkeyClient = this.getTurnkeyClient();
     }
     getRpcUrl() {
@@ -66,7 +60,9 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             const rpcUrl = this.getRpcUrl();
             if (!rpcUrl)
                 throw new DynamicError('No rpcUrl');
-            this._connectionClient = createSolanaConnection(rpcUrl, commitmentOrConfig);
+            const config = typeof commitmentOrConfig === 'string'
+                ? Object.assign(Object.assign({}, this.connectionConfig), { commitment: commitmentOrConfig }) : Object.assign(Object.assign({}, this.connectionConfig), commitmentOrConfig);
+            this._connectionClient = createSolanaConnection(rpcUrl, config);
         }
         return this._connectionClient;
     }
@@ -155,23 +151,6 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             return this.getTurnkeyAccount();
         });
     }
-    getTurnkeyClient() {
-        var _a;
-        let rpId = getTLD();
-        if (!rpId) {
-            rpId = PlatformService.getHostname();
-        }
-        const passkeyStamper = PasskeyService.createWebauthnStamper({
-            rpId,
-        });
-        const apiKeyStamper = TurnkeyWalletConnectorBase === null || TurnkeyWalletConnectorBase === void 0 ? void 0 : TurnkeyWalletConnectorBase.apiKeyStamper;
-        const stamper = apiKeyStamper !== null && apiKeyStamper !== void 0 ? apiKeyStamper : passkeyStamper;
-        this.__turnkeyClient =
-            (_a = this.getAuthenticatorHandler().client) !== null && _a !== void 0 ? _a : new TurnkeyClient({
-                baseUrl: TURNKEY_API_BASE_URL,
-            }, stamper);
-        return this.__turnkeyClient;
-    }
     createTurnkeyAccount(_a) {
         return __awaiter(this, arguments, void 0, function* ({ organizationId, }) {
             const turnkeyClient = this.getTurnkeyClient();
@@ -256,7 +235,7 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             return bufferToBase64(signedRawMessage);
         });
     }
-    signTransaction(transaction) {
+    internalSignTransaction(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.createOrRestoreSession();
             let account = yield this.getTurnkeyAccount();
@@ -284,27 +263,84 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             return transaction;
         });
     }
-    internalSignAndSendTransaction(transaction, options) {
+    signTransaction(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (!this.turnkeyAddress)
-                throw new DynamicError('Solana wallet not found');
-            const currentConnection = this.getConnection('confirmed');
-            const blockhash = yield currentConnection.getLatestBlockhash();
-            if ('version' in transaction) {
-                transaction.message.recentBlockhash =
-                    blockhash.blockhash;
+                throw new DynamicError('No turnkey account');
+            const uiTransaction = new SolanaUiTransaction({
+                connection: this.getConnection(),
+                from: this.turnkeyAddress,
+                multipleTransactions: [transaction],
+                onSubmit: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignTransaction(transaction); }),
+            });
+            return this.walletUiUtils.signTransaction(this, uiTransaction);
+        });
+    }
+    createUiTransaction(from) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
+            const transaction = new SolanaUiTransaction({
+                connection: this.getConnection(),
+                from,
+                onSubmit: (transaction) => __awaiter(this, void 0, void 0, function* () {
+                    if (!transaction)
+                        return undefined;
+                    return this.internalSignAndSendTransaction(transaction);
+                }),
+            });
+            return transaction;
+        });
+    }
+    internalSignAllTransactions(transactions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.createOrRestoreSession();
+            let account = yield this.getTurnkeyAccount();
+            const address = this.turnkeyAddress;
+            if (!account || !address) {
+                throw new Error('No turnkey account');
             }
-            else {
-                transaction.recentBlockhash = blockhash.blockhash;
-                transaction.feePayer =
-                    (_a = transaction.feePayer) !== null && _a !== void 0 ? _a : new PublicKey(this.turnkeyAddress);
+            try {
+                const signedTransactions = yield account.signAllTransactions(transactions, address);
+                return signedTransactions;
+            }
+            catch (err) {
+                if (TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS.some((errorMsg) => err.message.includes(errorMsg))) {
+                    yield this.removeSessionKeys();
+                    yield this.createOrRestoreSession({
+                        ignoreRestore: true,
+                    });
+                    account = (yield this.getTurnkeyAccount());
+                    const signedTransactions = yield account.signAllTransactions(transactions, address);
+                    return signedTransactions;
+                }
+                else {
+                    logger.error('[TK] failed to perform SignAllTransactions activity', err);
+                    throw err;
+                }
             }
-            const signedTransaction = yield this.signTransaction(transaction);
-            const signature = yield currentConnection.sendRawTransaction(Buffer.from(signedTransaction.serialize({
-                requireAllSignatures: false,
-                verifySignatures: false,
-            })), options);
+        });
+    }
+    signAllTransactions(transactions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.turnkeyAddress)
+                throw new DynamicError('No turnkey account');
+            const uiTransaction = new SolanaUiTransaction({
+                connection: this.getConnection(),
+                from: this.turnkeyAddress,
+                multipleTransactions: transactions,
+                onSubmit: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignAllTransactions(transactions); }),
+            });
+            return this.walletUiUtils.signTransaction(this, uiTransaction);
+        });
+    }
+    internalSignAndSendTransaction(transaction, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (!this.turnkeyAddress)
+                throw new DynamicError('Solana wallet not found');
+            const currentConnection = this.getConnection((_b = (_a = this.connectionConfig) === null || _a === void 0 ? void 0 : _a.commitment) !== null && _b !== void 0 ? _b : 'confirmed');
+            const signedTransaction = yield this.internalSignTransaction(transaction);
+            const signature = yield currentConnection.sendRawTransaction(signedTransaction.serialize(), options);
             // listen for tx confirmation until 60 seconds, which is ~150 blocks expiration
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
@@ -324,44 +360,15 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
     }
     signAndSendTransaction(transaction, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (!this.turnkeyAddress)
                 throw new DynamicError('Solana wallet not found');
-            let optimizedTransaction = transaction;
-            try {
-                if ((yield this.getNetwork()) === 'mainnet') {
-                    optimizedTransaction = (yield optimizeSolanaTransaction(this.getEnvId(), transaction, (_a = this.turnkeyAddress) !== null && _a !== void 0 ? _a : ''));
-                }
-            }
-            catch (e) {
-                logger.warn('Failed to optimize transaction', e);
-            }
-            const transactionsData = yield decodeTransaction(optimizedTransaction, this.getConnection(), this.turnkeyAddress);
-            if (!(transactionsData === null || transactionsData === void 0 ? void 0 : transactionsData.length)) {
-                throw new DynamicError('Incorrectly formatted transaction instructions');
-            }
-            let spent;
-            let insufficientFunds = false;
-            try {
-                spent = yield getTotalSolanaSpend(optimizedTransaction, this.getConnection(), this.turnkeyAddress);
-            }
-            catch (e) {
-                if (e.message === 'Insufficient funds') {
-                    insufficientFunds = true;
-                }
-            }
-            const to = summarizeTransactionDecodedData(transactionsData);
+            const optimizedTransaction = yield this.optimizeTransaction(transaction);
             const uiTransaction = new SolanaUiTransaction({
                 connection: this.getConnection(),
                 from: this.turnkeyAddress,
+                multipleTransactions: [optimizedTransaction],
                 onSubmit: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignAndSendTransaction(optimizedTransaction, options); }),
-                originalTransaction: optimizedTransaction,
             });
-            uiTransaction.to = to;
-            uiTransaction.value = spent;
-            if (insufficientFunds) {
-                uiTransaction.notEnoughFundsError = true;
-            }
             // TODO: remove this. We should not be passing references to wallet connectors
             return this.walletUiUtils.sendTransaction(this, uiTransaction);
         });
@@ -404,16 +411,27 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
     lamportsToSol(lamports) {
         return lamports / LAMPORTS_PER_SOL;
     }
-    createUiTransaction(from) {
+    optimizeTransaction(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.validateActiveWallet(from);
-            const transaction = new SolanaUiTransaction({
-                connection: this.getConnection(),
-                from,
-                onSubmit: (transaction) => __awaiter(this, void 0, void 0, function* () { return this.internalSignAndSendTransaction(transaction); }),
-            });
-            transaction.feeDeducted = true;
-            return transaction;
+            var _a;
+            let optimizedTransaction = 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);
+            }
+            try {
+                // we cannot optimize partially signed transactions as once a tx is modified the signatures are no longer valid
+                if ((yield this.getNetwork()) === 'mainnet' && !alreadySigned) {
+                    optimizedTransaction = (yield optimizeSolanaTransaction(this.getEnvId(), transaction, (_a = this.turnkeyAddress) !== null && _a !== void 0 ? _a : ''));
+                }
+            }
+            catch (e) {
+                logger.warn('Failed to optimize transaction', e);
+            }
+            return optimizedTransaction;
         });
     }
 }

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

@@ -1,2 +1 @@
 export { createSolanaConnection } from './createSolanaConnection';
-export { decodeTransaction, summarizeTransactionDecodedData, getTotalSolanaSpend, } from './transactionDecoder';

package/src/lib/utils/transactionDecoder/index.d.ts

@@ -1 +0,0 @@
-export { decodeTransaction, summarizeTransactionDecodedData, getTotalSolanaSpend, } from './transactionDecoder';