@debridge-finance/solana-utils 2.2.0 → 2.3.0

package/dist/browser/index.js

@@ -1,4 +1,4 @@
-import { Transaction, Message, VersionedTransaction, MessageV0, PublicKey } from '@solana/web3.js';
+import { Transaction, VersionedTransaction, MessageV0, PublicKey } from '@solana/web3.js';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -7589,12 +7589,14 @@ function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSe
     return __awaiter(this, void 0, void 0, function* () {
         const txId = yield connection.sendRawTransaction(serialized, {
             skipPreflight: true,
+            maxRetries: 1000,
         });
         let blockheight = yield connection.getBlockHeight();
         let sent = 0;
         while (blockheight < lastValidBlockHeight && sent < timesToSend) {
             yield connection.sendRawTransaction(serialized, {
                 skipPreflight: true,
+                maxRetries: 1000,
             });
             yield sleep(300);
             blockheight = yield connection.getBlockHeight();
@@ -7620,7 +7622,7 @@ function sendAll(connection, wallet, transactions, signers, waitBetweenSend, ski
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (convertIntoTxV0) {
-            const fakeBlockHash = "0".repeat(64);
+            const fakeBlockHash = "1".repeat(32);
             transactions = transactions.map((tx) => txToV0(tx, wallet.publicKey, fakeBlockHash));
         }
         let txIds = [];
@@ -7636,13 +7638,12 @@ function sendAll(connection, wallet, transactions, signers, waitBetweenSend, ski
                 else {
                     tx.recentBlockhash = blockhash;
                     tx.feePayer = wallet.publicKey;
-                    const message = Message.from(tx.serializeMessage());
-                    txV0 = new VersionedTransaction(new MessageV0({ addressTableLookups: [], compiledInstructions: [], header: message.header, recentBlockhash: blockhash, staticAccountKeys: message.accountKeys }));
+                    txV0 = new VersionedTransaction(MessageV0.compile({ addressLookupTableAccounts: [], instructions: tx.instructions, recentBlockhash: blockhash, payerKey: tx.feePayer }));
                 }
                 if (!skipPreflight) {
                     const simulationResult = yield connection.simulateTransaction(txV0, { sigVerify: false, replaceRecentBlockhash: true, commitment: "confirmed" });
                     if (simulationResult.value.err !== null) {
-                        throw new Error(`Tx simulation Error! Transaction message dump: ${buffer.Buffer.from(tx.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${(_b = simulationResult.value.logs) === null || _b === void 0 ? void 0 : _b.join("\n")}`);
+                        throw new Error(`Tx simulation Error! Transaction message dump: ${buffer.Buffer.from(txV0.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${(_b = simulationResult.value.logs) === null || _b === void 0 ? void 0 : _b.join("\n")}`);
                     }
                 }
             })));
@@ -7667,14 +7668,13 @@ function sendAll(connection, wallet, transactions, signers, waitBetweenSend, ski
                 else {
                     tx.recentBlockhash = blockhash;
                     tx.feePayer = wallet.publicKey;
-                    const message = Message.from(tx.serializeMessage());
-                    txV0 = new VersionedTransaction(new MessageV0({ addressTableLookups: [], compiledInstructions: [], header: message.header, recentBlockhash: blockhash, staticAccountKeys: message.accountKeys }));
+                    txV0 = new VersionedTransaction(MessageV0.compile({ addressLookupTableAccounts: [], instructions: tx.instructions, recentBlockhash: blockhash, payerKey: tx.feePayer }));
                 }
                 const signed = yield wallet.signTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
                 if (!skipPreflight) {
                     const simulationResult = yield connection.simulateTransaction(txV0, { sigVerify: false, replaceRecentBlockhash: true, commitment: "confirmed" });
                     if (simulationResult.value.err !== null) {
-                        throw new Error(`Tx simulation Error! Transaction message dump: ${buffer.Buffer.from(tx.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${(_a = simulationResult.value.logs) === null || _a === void 0 ? void 0 : _a.join("\n")}`);
+                        throw new Error(`Tx simulation Error! Transaction message dump: ${buffer.Buffer.from(txV0.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${(_a = simulationResult.value.logs) === null || _a === void 0 ? void 0 : _a.join("\n")}`);
                     }
                 }
                 const serialized = buffer.Buffer.from(signed.serialize());