@dynamic-labs/solana-core 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,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.0.0-alpha.27";
+var version = "4.0.0-alpha.29";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.0.0-alpha.27";
+var version = "4.0.0-alpha.29";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana-core",
-  "version": "4.0.0-alpha.27",
+  "version": "4.0.0-alpha.29",
   "description": "Core package for utilities and types for solana",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -18,17 +18,17 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.559",
+    "@dynamic-labs/sdk-api-core": "0.0.563",
     "@solana/web3.js": "1.92.1",
     "@solana/spl-token": "0.4.6"
   },
   "peerDependencies": {
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.27",
-    "@dynamic-labs/rpc-providers": "4.0.0-alpha.27",
-    "@dynamic-labs/types": "4.0.0-alpha.27",
-    "@dynamic-labs/utils": "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/assert-package-version": "4.0.0-alpha.29",
+    "@dynamic-labs/rpc-providers": "4.0.0-alpha.29",
+    "@dynamic-labs/types": "4.0.0-alpha.29",
+    "@dynamic-labs/utils": "4.0.0-alpha.29",
+    "@dynamic-labs/wallet-book": "4.0.0-alpha.29",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.29",
     "eventemitter3": "5.0.1"
   }
 }

package/src/utils/SolanaUiTransaction/SolanaUiTransaction.cjs

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

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

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

package/src/utils/SolanaUiTransaction/SolanaUiTransaction.js

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