@debridge-finance/solana-utils 4.4.0 → 4.4.2

package/dist/browser/index.js

@@ -6667,14 +6667,16 @@ function simulateTx(connection, tx, commitment, feePayer, convertToV0, alreadySi
  * @returns
  */
 function sendAll(connection, wallet, transactions, options) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
-        const skipSign = (options === null || options === void 0 ? void 0 : options.skipSign) === undefined ? false : options.skipSign;
+        const skipSign = (_a = options === null || options === void 0 ? void 0 : options.skipSign) !== null && _a !== void 0 ? _a : false;
         const blockhashCommitment = (options === null || options === void 0 ? void 0 : options.blockhashCommitment) === undefined
-            ? (_a = connection.commitment) !== null && _a !== void 0 ? _a : "confirmed"
+            ? (_b = connection.commitment) !== null && _b !== void 0 ? _b : "confirmed"
             : options.blockhashCommitment;
-        const convertIntoTxV0 = (options === null || options === void 0 ? void 0 : options.convertIntoTxV0) === undefined ? true : options.convertIntoTxV0;
-        const skipPreflight = (options === null || options === void 0 ? void 0 : options.skipPreflight) === undefined ? false : options.skipPreflight;
+        const simulationCommitment = (_c = options === null || options === void 0 ? void 0 : options.simulationCommtiment) !== null && _c !== void 0 ? _c : blockhashCommitment;
+        const useMinContextSlot = (_d = options === null || options === void 0 ? void 0 : options.useMinContextSlot) !== null && _d !== void 0 ? _d : false;
+        const convertIntoTxV0 = (_e = options === null || options === void 0 ? void 0 : options.convertIntoTxV0) !== null && _e !== void 0 ? _e : true;
+        const skipPreflight = (_f = options === null || options === void 0 ? void 0 : options.skipPreflight) !== null && _f !== void 0 ? _f : false;
         if (!Array.isArray(transactions))
             transactions = [transactions];
         if (convertIntoTxV0) {
@@ -6683,13 +6685,13 @@ function sendAll(connection, wallet, transactions, options) {
         let txIds = [];
         if ((options === null || options === void 0 ? void 0 : options.waitBetweenSend) === undefined || options.waitBetweenSend === 0) {
             if (!skipPreflight) {
-                yield Promise.all(transactions.map((tx) => simulateTx(connection, tx, blockhashCommitment, wallet.publicKey, convertIntoTxV0, skipSign)));
+                yield Promise.all(transactions.map((tx) => simulateTx(connection, tx, simulationCommitment, wallet.publicKey, convertIntoTxV0, skipSign)));
             }
-            const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash({ commitment: blockhashCommitment });
+            const blockhashResponse = yield connection.getLatestBlockhashAndContext({ commitment: blockhashCommitment });
             let signed = transactions;
             if (!skipSign) {
                 // set real blockhash
-                transactions.map((tx) => setBlockhash(tx, blockhash));
+                transactions.map((tx) => setBlockhash(tx, blockhashResponse.value.blockhash));
                 // sign after setting correct blockhashes
                 signed = yield wallet.signAllTransactions(transactions, options === null || options === void 0 ? void 0 : options.signers);
             }
@@ -6698,8 +6700,9 @@ function sendAll(connection, wallet, transactions, options) {
                 const serialized = buffer.Buffer.from(signedTx.serialize()).toString("base64");
                 (_a = options === null || options === void 0 ? void 0 : options.logger) === null || _a === void 0 ? void 0 : _a.call(options, `Sending tx: ${serialized}`);
                 return connection.sendEncodedTransaction(serialized, {
-                    preflightCommitment: blockhashCommitment,
+                    preflightCommitment: simulationCommitment,
                     skipPreflight: false,
+                    minContextSlot: useMinContextSlot ? blockhashResponse.context.slot + 1 : undefined,
                 });
             }));
         }
@@ -6712,12 +6715,12 @@ function sendAll(connection, wallet, transactions, options) {
                         ? options.signers[i]
                         : undefined);
                 if (!skipPreflight) {
-                    yield simulateTx(connection, tx, blockhashCommitment, wallet.publicKey, convertIntoTxV0, skipSign);
+                    yield simulateTx(connection, tx, simulationCommitment, wallet.publicKey, convertIntoTxV0, skipSign);
                 }
                 const serialized = buffer.Buffer.from(signed.serialize()).toString("base64");
-                (_b = options === null || options === void 0 ? void 0 : options.logger) === null || _b === void 0 ? void 0 : _b.call(options, `Sending tx: ${serialized}`);
+                (_g = options === null || options === void 0 ? void 0 : options.logger) === null || _g === void 0 ? void 0 : _g.call(options, `Sending tx: ${serialized}`);
                 txIds.push(yield connection.sendEncodedTransaction(serialized, {
-                    preflightCommitment: blockhashCommitment,
+                    preflightCommitment: simulationCommitment,
                     skipPreflight: false,
                 }));
                 yield sleep(options.waitBetweenSend);