@dynamic-labs/embedded-wallet-solana 4.0.0-alpha.27 → 4.0.0-alpha.29

package/CHANGELOG.md

@@ -1,4 +1,25 @@
 
+## [4.0.0-alpha.29](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.28...v4.0.0-alpha.29) (2024-11-07)
+
+## [4.0.0-alpha.28](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.27...v4.0.0-alpha.28) (2024-11-07)
+
+
+### ⚠ BREAKING CHANGES
+
+* upgrade to starknet v6
+See this guide for more details: https://starknetjs.com/docs/guides/migrate/
+There are no code changes required on the Dynamic SDK side, however if you have installed the `starknet` package, you will need to upgrade to >= v6.11.0.
+
+### Features
+
+* new transaction modal and ui for sign/signAll ([#7296](https://github.com/dynamic-labs/dynamic-auth/issues/7296)) ([05a8af1](https://github.com/dynamic-labs/dynamic-auth/commit/05a8af1eb772b2b8087ed96a54caf4b6ae8b79d2)), closes [#7297](https://github.com/dynamic-labs/dynamic-auth/issues/7297) [#7298](https://github.com/dynamic-labs/dynamic-auth/issues/7298)
+* upgrade to starknet v6 ([#7189](https://github.com/dynamic-labs/dynamic-auth/issues/7189)) ([2a6e24e](https://github.com/dynamic-labs/dynamic-auth/commit/2a6e24e4178fcee671b381c28f6a681f4ce52c62))
+
+
+### Bug Fixes
+
+* transaction confirmation modal popup ([#7368](https://github.com/dynamic-labs/dynamic-auth/issues/7368)) ([3c48658](https://github.com/dynamic-labs/dynamic-auth/commit/3c48658a62874d908bba8f06fb092ff5983ede16))
+
 ## [4.0.0-alpha.27](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.26...v4.0.0-alpha.27) (2024-11-06)
 
 

package/package.cjs

@@ -3,14 +3,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.0.0-alpha.27";
+var version = "4.0.0-alpha.29";
 var dependencies = {
-	"@dynamic-labs/utils": "4.0.0-alpha.27",
-	"@dynamic-labs/logger": "4.0.0-alpha.27",
-	"@dynamic-labs/types": "4.0.0-alpha.27",
-	"@dynamic-labs/sdk-api-core": "0.0.559",
+	"@dynamic-labs/utils": "4.0.0-alpha.29",
+	"@dynamic-labs/logger": "4.0.0-alpha.29",
+	"@dynamic-labs/types": "4.0.0-alpha.29",
+	"@dynamic-labs/sdk-api-core": "0.0.563",
 	eventemitter3: "5.0.1",
-	"@solana/spl-token": "0.4.6",
 	"@solana/web3.js": "1.92.1",
 	"@turnkey/iframe-stamper": "2.0.0",
 	"@turnkey/solana": "1.0.1",

package/package.js

@@ -1,12 +1,11 @@
 'use client'
-var version = "4.0.0-alpha.27";
+var version = "4.0.0-alpha.29";
 var dependencies = {
-	"@dynamic-labs/utils": "4.0.0-alpha.27",
-	"@dynamic-labs/logger": "4.0.0-alpha.27",
-	"@dynamic-labs/types": "4.0.0-alpha.27",
-	"@dynamic-labs/sdk-api-core": "0.0.559",
+	"@dynamic-labs/utils": "4.0.0-alpha.29",
+	"@dynamic-labs/logger": "4.0.0-alpha.29",
+	"@dynamic-labs/types": "4.0.0-alpha.29",
+	"@dynamic-labs/sdk-api-core": "0.0.563",
 	eventemitter3: "5.0.1",
-	"@solana/spl-token": "0.4.6",
 	"@solana/web3.js": "1.92.1",
 	"@turnkey/iframe-stamper": "2.0.0",
 	"@turnkey/solana": "1.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/embedded-wallet-solana",
-  "version": "4.0.0-alpha.27",
+  "version": "4.0.0-alpha.29",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -18,23 +18,22 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/utils": "4.0.0-alpha.27",
-    "@dynamic-labs/logger": "4.0.0-alpha.27",
-    "@dynamic-labs/types": "4.0.0-alpha.27",
-    "@dynamic-labs/sdk-api-core": "0.0.559",
+    "@dynamic-labs/utils": "4.0.0-alpha.29",
+    "@dynamic-labs/logger": "4.0.0-alpha.29",
+    "@dynamic-labs/types": "4.0.0-alpha.29",
+    "@dynamic-labs/sdk-api-core": "0.0.563",
     "eventemitter3": "5.0.1",
-    "@solana/spl-token": "0.4.6",
     "@solana/web3.js": "1.92.1",
     "@turnkey/iframe-stamper": "2.0.0",
     "@turnkey/solana": "1.0.1",
     "@turnkey/webauthn-stamper": "0.5.0",
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.27",
-    "@dynamic-labs/embedded-wallet": "4.0.0-alpha.27",
-    "@dynamic-labs/rpc-providers": "4.0.0-alpha.27",
-    "@dynamic-labs/solana-core": "4.0.0-alpha.27",
-    "@dynamic-labs/wallet-book": "4.0.0-alpha.27",
-    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.27",
-    "@dynamic-labs/webauthn": "4.0.0-alpha.27",
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.29",
+    "@dynamic-labs/embedded-wallet": "4.0.0-alpha.29",
+    "@dynamic-labs/rpc-providers": "4.0.0-alpha.29",
+    "@dynamic-labs/solana-core": "4.0.0-alpha.29",
+    "@dynamic-labs/wallet-book": "4.0.0-alpha.29",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.29",
+    "@dynamic-labs/webauthn": "4.0.0-alpha.29",
     "react-dom": "18.2.0",
     "viem": "2.9.25"
   },

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.cjs

@@ -13,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');
 
@@ -240,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();
@@ -268,7 +267,35 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             return transaction;
         });
     }
-    signAllTransactions(transactions) {
+    signTransaction(transaction) {
+        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: [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();
@@ -297,13 +324,26 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             }
         });
     }
+    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.signTransaction(transaction);
+            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) => {
@@ -324,52 +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;
-            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);
-            }
-            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);
         });
@@ -412,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

@@ -46,12 +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>;
+    private optimizeTransaction;
 }
 export {};

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.js

@@ -9,7 +9,6 @@ import { DynamicError, bufferToBase64 } from '@dynamic-labs/utils';
 import { SolanaWallet, ProviderChain, getGenesisHashLSKey, SolanaUiTransaction } from '@dynamic-labs/solana-core';
 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';
 
@@ -236,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();
@@ -264,7 +263,35 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             return transaction;
         });
     }
-    signAllTransactions(transactions) {
+    signTransaction(transaction) {
+        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: [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();
@@ -293,13 +320,26 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             }
         });
     }
+    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.signTransaction(transaction);
+            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) => {
@@ -320,52 +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;
-            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);
-            }
-            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);
         });
@@ -408,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';

package/src/lib/utils/transactionDecoder/transactionDecoder.cjs

@@ -1,176 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../../../_virtual/_tslib.cjs');
-var web3_js = require('@solana/web3.js');
-var splToken = require('@solana/spl-token');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var utils = require('@dynamic-labs/utils');
-
-const getTotalSolanaSpend = (transaction, connection, thisAddress) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    let simulation;
-    let feePayer;
-    if ('version' in transaction) {
-        [feePayer] = transaction.message.staticAccountKeys;
-        simulation = yield connection.simulateTransaction(transaction, {
-            accounts: {
-                addresses: feePayer.toBase58() && feePayer.toBase58() !== thisAddress
-                    ? [feePayer.toBase58(), thisAddress]
-                    : [thisAddress],
-                encoding: 'base64',
-            },
-            replaceRecentBlockhash: true,
-        });
-    }
-    else {
-        feePayer =
-            transaction.feePayer || transaction.instructions[0].keys[0].pubkey;
-        simulation = yield connection.simulateTransaction(transaction, undefined, feePayer.toBase58() && feePayer.toBase58() !== thisAddress
-            ? [feePayer, new web3_js.PublicKey(thisAddress)]
-            : [new web3_js.PublicKey(thisAddress)]);
-    }
-    const previousBalance = yield connection.getBalance(new web3_js.PublicKey(thisAddress));
-    if (!((_c = (_b = (_a = simulation === null || simulation === void 0 ? void 0 : simulation.value) === null || _a === void 0 ? void 0 : _a.accounts) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.lamports)) {
-        walletConnectorCore.logger.debug('Transaction simulation failed', simulation);
-        const instructionError = JSON.stringify({
-            InstructionError: [
-                0,
-                {
-                    Custom: 1,
-                },
-            ],
-        });
-        const insufficientFundsForRent = JSON.stringify({
-            InsufficientFundsForRent: {
-                account_index: 0,
-            },
-        });
-        if (JSON.stringify(simulation === null || simulation === void 0 ? void 0 : simulation.value.err) === instructionError ||
-            JSON.stringify(simulation === null || simulation === void 0 ? void 0 : simulation.value.err) === insufficientFundsForRent) {
-            throw new Error('Insufficient funds');
-        }
-        return undefined;
-    }
-    // the last account will be the embedded wallet,
-    // if there are two addresses the first will be gas-sponsoring so we dont want to calculate sol for that
-    const totalSolTransfer = previousBalance -
-        ((_g = (_f = (_e = (_d = simulation === null || simulation === void 0 ? void 0 : simulation.value) === null || _d === void 0 ? void 0 : _d.accounts) === null || _e === void 0 ? void 0 : _e[1]) === null || _f === void 0 ? void 0 : _f.lamports) !== null && _g !== void 0 ? _g : (_k = (_j = (_h = simulation === null || simulation === void 0 ? void 0 : simulation.value) === null || _h === void 0 ? void 0 : _h.accounts) === null || _j === void 0 ? void 0 : _j[0]) === null || _k === void 0 ? void 0 : _k.lamports);
-    return BigInt(totalSolTransfer);
-});
-const decodeTransaction = (transaction, connection, thisAddress) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _l;
-    if (!transaction) {
-        throw new utils.DynamicError('Transaction is required');
-    }
-    try {
-        let decodedInstructions = [];
-        if ('version' in transaction) {
-            const lookupTableAddresses = transaction.message.addressTableLookups.map((lookup) => new web3_js.PublicKey(lookup.accountKey));
-            // For non-simple SOL transfers, we need to fetch the lookup table accounts
-            if (lookupTableAddresses.length > 0) {
-                const lookupTables = yield Promise.all(lookupTableAddresses.map((address) => connection.getAddressLookupTable(address)));
-                const lookupTableAccounts = lookupTables
-                    .filter((result) => result !== null)
-                    .map((result) => result.value);
-                if (lookupTableAccounts.length > 0) {
-                    decodedInstructions = web3_js.TransactionMessage.decompile(transaction.message, {
-                        addressLookupTableAccounts: lookupTableAccounts,
-                    }).instructions;
-                }
-            }
-            else {
-                decodedInstructions = web3_js.TransactionMessage.decompile(transaction.message).instructions;
-            }
-        }
-        else if (!transaction.instructions) {
-            decodedInstructions = (_l = web3_js.Transaction.from(Buffer.from(transaction.serialize()))) === null || _l === void 0 ? void 0 : _l.instructions;
-        }
-        else {
-            decodedInstructions = transaction.instructions;
-        }
-        if (!(decodedInstructions === null || decodedInstructions === void 0 ? void 0 : decodedInstructions.length)) {
-            throw new utils.DynamicError('Bad formatted instruction');
-        }
-        const solTransfers = decodedInstructions.filter((instruction) => instruction.programId.equals(web3_js.SystemProgram.programId));
-        // Non-SPL transfers, just SOL
-        if (solTransfers.length > 0) {
-            return solTransfers.map((decodedInstruction) => {
-                let decodedTransferInstruction;
-                try {
-                    decodedTransferInstruction =
-                        web3_js.SystemInstruction.decodeTransfer(decodedInstruction);
-                }
-                catch (e) {
-                    return { from: thisAddress, to: 'Unknown' };
-                }
-                return {
-                    from: decodedTransferInstruction === null || decodedTransferInstruction === void 0 ? void 0 : decodedTransferInstruction.fromPubkey.toBase58(),
-                    to: decodedTransferInstruction === null || decodedTransferInstruction === void 0 ? void 0 : decodedTransferInstruction.toPubkey.toBase58(),
-                };
-            });
-        }
-        // SPL transfers
-        let splTransfers = yield Promise.all(decodedInstructions.map((instruction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            var _m, _o, _p, _q, _r, _s, _t;
-            if (instruction.programId.equals(splToken.TOKEN_PROGRAM_ID)) {
-                const decodedTokenInstruction = splToken.decodeTransferInstructionUnchecked(instruction);
-                const { source, destination } = decodedTokenInstruction.keys;
-                if (destination) {
-                    // For contract interactions, e.g., swaps, the destination is the turnkey address, flip sender and receiver
-                    if ((destination === null || destination === void 0 ? void 0 : destination.pubkey.toBase58()) === thisAddress) {
-                        return {
-                            from: thisAddress,
-                            to: source === null || source === void 0 ? void 0 : source.pubkey.toBase58(),
-                        };
-                    }
-                    // Pure SPL transfers, get the address from the destination token account to display to user
-                    const destinationAccountInfo = yield connection.getParsedAccountInfo(destination.pubkey);
-                    const isTokenAccount = ((_p = (_o = (_m = destinationAccountInfo.value) === null || _m === void 0 ? void 0 : _m.data) === null || _o === void 0 ? void 0 : _o.parsed) === null || _p === void 0 ? void 0 : _p.type) === 'account';
-                    const destinationOwner = isTokenAccount
-                        ? (_t = (_s = (_r = (_q = destinationAccountInfo.value) === null || _q === void 0 ? void 0 : _q.data) === null || _r === void 0 ? void 0 : _r.parsed) === null || _s === void 0 ? void 0 : _s.info) === null || _t === void 0 ? void 0 : _t.owner
-                        : null;
-                    const toAddress = destinationOwner
-                        ? destinationOwner
-                        : destination === null || destination === void 0 ? void 0 : destination.pubkey.toBase58();
-                    return {
-                        from: thisAddress,
-                        to: toAddress,
-                    };
-                }
-            }
-            return null;
-        })));
-        splTransfers = splTransfers.filter((transfer) => transfer !== null);
-        if (splTransfers === null || splTransfers === void 0 ? void 0 : splTransfers.length)
-            return splTransfers;
-        // Return program IDs for non-SOL and non-SPL transfers
-        const noTransferDestinations = decodedInstructions.map((instruction) => ({
-            from: thisAddress,
-            to: instruction.programId.toBase58(),
-        }));
-        if (noTransferDestinations.length)
-            return noTransferDestinations;
-        return [{ from: thisAddress, to: 'Unknown' }];
-    }
-    catch (error) {
-        walletConnectorCore.logger.warn('[decodeTransaction]', error);
-        return [{ from: thisAddress, to: 'Unknown' }];
-    }
-});
-const summarizeTransactionDecodedData = (transactionsData) => {
-    const recipients = new Set();
-    transactionsData.forEach((transactionData) => {
-        if (transactionData && transactionData.to) {
-            recipients.add(transactionData.to);
-        }
-    });
-    const to = recipients.size === 1 ? recipients.values().next().value : 'Multiple';
-    return to;
-};
-
-exports.decodeTransaction = decodeTransaction;
-exports.getTotalSolanaSpend = getTotalSolanaSpend;
-exports.summarizeTransactionDecodedData = summarizeTransactionDecodedData;

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

@@ -1,12 +0,0 @@
-import { Transaction, VersionedTransaction, Connection } from '@solana/web3.js';
-type DestinationAndFrom = {
-    to: string;
-    from: string;
-};
-export declare const getTotalSolanaSpend: (transaction: Transaction | VersionedTransaction, connection: Connection, thisAddress: string) => Promise<bigint | undefined>;
-export declare const decodeTransaction: (transaction: Transaction | VersionedTransaction, connection: Connection, thisAddress: string) => Promise<Array<DestinationAndFrom>>;
-export declare const summarizeTransactionDecodedData: (transactionsData: {
-    to: string;
-    from: string;
-}[]) => any;
-export {};

package/src/lib/utils/transactionDecoder/transactionDecoder.js

@@ -1,170 +0,0 @@
-'use client'
-import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { PublicKey, TransactionMessage, Transaction, SystemProgram, SystemInstruction } from '@solana/web3.js';
-import { TOKEN_PROGRAM_ID, decodeTransferInstructionUnchecked } from '@solana/spl-token';
-import { logger } from '@dynamic-labs/wallet-connector-core';
-import { DynamicError } from '@dynamic-labs/utils';
-
-const getTotalSolanaSpend = (transaction, connection, thisAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    let simulation;
-    let feePayer;
-    if ('version' in transaction) {
-        [feePayer] = transaction.message.staticAccountKeys;
-        simulation = yield connection.simulateTransaction(transaction, {
-            accounts: {
-                addresses: feePayer.toBase58() && feePayer.toBase58() !== thisAddress
-                    ? [feePayer.toBase58(), thisAddress]
-                    : [thisAddress],
-                encoding: 'base64',
-            },
-            replaceRecentBlockhash: true,
-        });
-    }
-    else {
-        feePayer =
-            transaction.feePayer || transaction.instructions[0].keys[0].pubkey;
-        simulation = yield connection.simulateTransaction(transaction, undefined, feePayer.toBase58() && feePayer.toBase58() !== thisAddress
-            ? [feePayer, new PublicKey(thisAddress)]
-            : [new PublicKey(thisAddress)]);
-    }
-    const previousBalance = yield connection.getBalance(new PublicKey(thisAddress));
-    if (!((_c = (_b = (_a = simulation === null || simulation === void 0 ? void 0 : simulation.value) === null || _a === void 0 ? void 0 : _a.accounts) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.lamports)) {
-        logger.debug('Transaction simulation failed', simulation);
-        const instructionError = JSON.stringify({
-            InstructionError: [
-                0,
-                {
-                    Custom: 1,
-                },
-            ],
-        });
-        const insufficientFundsForRent = JSON.stringify({
-            InsufficientFundsForRent: {
-                account_index: 0,
-            },
-        });
-        if (JSON.stringify(simulation === null || simulation === void 0 ? void 0 : simulation.value.err) === instructionError ||
-            JSON.stringify(simulation === null || simulation === void 0 ? void 0 : simulation.value.err) === insufficientFundsForRent) {
-            throw new Error('Insufficient funds');
-        }
-        return undefined;
-    }
-    // the last account will be the embedded wallet,
-    // if there are two addresses the first will be gas-sponsoring so we dont want to calculate sol for that
-    const totalSolTransfer = previousBalance -
-        ((_g = (_f = (_e = (_d = simulation === null || simulation === void 0 ? void 0 : simulation.value) === null || _d === void 0 ? void 0 : _d.accounts) === null || _e === void 0 ? void 0 : _e[1]) === null || _f === void 0 ? void 0 : _f.lamports) !== null && _g !== void 0 ? _g : (_k = (_j = (_h = simulation === null || simulation === void 0 ? void 0 : simulation.value) === null || _h === void 0 ? void 0 : _h.accounts) === null || _j === void 0 ? void 0 : _j[0]) === null || _k === void 0 ? void 0 : _k.lamports);
-    return BigInt(totalSolTransfer);
-});
-const decodeTransaction = (transaction, connection, thisAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    var _l;
-    if (!transaction) {
-        throw new DynamicError('Transaction is required');
-    }
-    try {
-        let decodedInstructions = [];
-        if ('version' in transaction) {
-            const lookupTableAddresses = transaction.message.addressTableLookups.map((lookup) => new PublicKey(lookup.accountKey));
-            // For non-simple SOL transfers, we need to fetch the lookup table accounts
-            if (lookupTableAddresses.length > 0) {
-                const lookupTables = yield Promise.all(lookupTableAddresses.map((address) => connection.getAddressLookupTable(address)));
-                const lookupTableAccounts = lookupTables
-                    .filter((result) => result !== null)
-                    .map((result) => result.value);
-                if (lookupTableAccounts.length > 0) {
-                    decodedInstructions = TransactionMessage.decompile(transaction.message, {
-                        addressLookupTableAccounts: lookupTableAccounts,
-                    }).instructions;
-                }
-            }
-            else {
-                decodedInstructions = TransactionMessage.decompile(transaction.message).instructions;
-            }
-        }
-        else if (!transaction.instructions) {
-            decodedInstructions = (_l = Transaction.from(Buffer.from(transaction.serialize()))) === null || _l === void 0 ? void 0 : _l.instructions;
-        }
-        else {
-            decodedInstructions = transaction.instructions;
-        }
-        if (!(decodedInstructions === null || decodedInstructions === void 0 ? void 0 : decodedInstructions.length)) {
-            throw new DynamicError('Bad formatted instruction');
-        }
-        const solTransfers = decodedInstructions.filter((instruction) => instruction.programId.equals(SystemProgram.programId));
-        // Non-SPL transfers, just SOL
-        if (solTransfers.length > 0) {
-            return solTransfers.map((decodedInstruction) => {
-                let decodedTransferInstruction;
-                try {
-                    decodedTransferInstruction =
-                        SystemInstruction.decodeTransfer(decodedInstruction);
-                }
-                catch (e) {
-                    return { from: thisAddress, to: 'Unknown' };
-                }
-                return {
-                    from: decodedTransferInstruction === null || decodedTransferInstruction === void 0 ? void 0 : decodedTransferInstruction.fromPubkey.toBase58(),
-                    to: decodedTransferInstruction === null || decodedTransferInstruction === void 0 ? void 0 : decodedTransferInstruction.toPubkey.toBase58(),
-                };
-            });
-        }
-        // SPL transfers
-        let splTransfers = yield Promise.all(decodedInstructions.map((instruction) => __awaiter(void 0, void 0, void 0, function* () {
-            var _m, _o, _p, _q, _r, _s, _t;
-            if (instruction.programId.equals(TOKEN_PROGRAM_ID)) {
-                const decodedTokenInstruction = decodeTransferInstructionUnchecked(instruction);
-                const { source, destination } = decodedTokenInstruction.keys;
-                if (destination) {
-                    // For contract interactions, e.g., swaps, the destination is the turnkey address, flip sender and receiver
-                    if ((destination === null || destination === void 0 ? void 0 : destination.pubkey.toBase58()) === thisAddress) {
-                        return {
-                            from: thisAddress,
-                            to: source === null || source === void 0 ? void 0 : source.pubkey.toBase58(),
-                        };
-                    }
-                    // Pure SPL transfers, get the address from the destination token account to display to user
-                    const destinationAccountInfo = yield connection.getParsedAccountInfo(destination.pubkey);
-                    const isTokenAccount = ((_p = (_o = (_m = destinationAccountInfo.value) === null || _m === void 0 ? void 0 : _m.data) === null || _o === void 0 ? void 0 : _o.parsed) === null || _p === void 0 ? void 0 : _p.type) === 'account';
-                    const destinationOwner = isTokenAccount
-                        ? (_t = (_s = (_r = (_q = destinationAccountInfo.value) === null || _q === void 0 ? void 0 : _q.data) === null || _r === void 0 ? void 0 : _r.parsed) === null || _s === void 0 ? void 0 : _s.info) === null || _t === void 0 ? void 0 : _t.owner
-                        : null;
-                    const toAddress = destinationOwner
-                        ? destinationOwner
-                        : destination === null || destination === void 0 ? void 0 : destination.pubkey.toBase58();
-                    return {
-                        from: thisAddress,
-                        to: toAddress,
-                    };
-                }
-            }
-            return null;
-        })));
-        splTransfers = splTransfers.filter((transfer) => transfer !== null);
-        if (splTransfers === null || splTransfers === void 0 ? void 0 : splTransfers.length)
-            return splTransfers;
-        // Return program IDs for non-SOL and non-SPL transfers
-        const noTransferDestinations = decodedInstructions.map((instruction) => ({
-            from: thisAddress,
-            to: instruction.programId.toBase58(),
-        }));
-        if (noTransferDestinations.length)
-            return noTransferDestinations;
-        return [{ from: thisAddress, to: 'Unknown' }];
-    }
-    catch (error) {
-        logger.warn('[decodeTransaction]', error);
-        return [{ from: thisAddress, to: 'Unknown' }];
-    }
-});
-const summarizeTransactionDecodedData = (transactionsData) => {
-    const recipients = new Set();
-    transactionsData.forEach((transactionData) => {
-        if (transactionData && transactionData.to) {
-            recipients.add(transactionData.to);
-        }
-    });
-    const to = recipients.size === 1 ? recipients.values().next().value : 'Multiple';
-    return to;
-};
-
-export { decodeTransaction, getTotalSolanaSpend, summarizeTransactionDecodedData };