@debridge-finance/solana-utils 2.0.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 : {};
 
@@ -7501,6 +7501,20 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
+function getAccountInfo(connection, account) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const info = yield connection.getAccountInfo(account);
+        if (info) {
+            // alchemy bug fix
+            if (info.lamports === 0 && info.rentEpoch === 0)
+                return null;
+            return info;
+        }
+        else {
+            return null;
+        }
+    });
+}
 function hexToBuffer(data, align) {
     if (!data.startsWith("0x"))
         throw new Error("[hexToBuffer]: string must start with 0x");
@@ -7571,17 +7585,18 @@ class Wallet {
         });
     }
 }
-function sendWithRetries(connection, serialized, lastValidBlockHeight) {
+function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5) {
     return __awaiter(this, void 0, void 0, function* () {
         const txId = yield connection.sendRawTransaction(serialized, {
             skipPreflight: true,
+            maxRetries: 1000,
         });
         let blockheight = yield connection.getBlockHeight();
-        const timesToSend = 5;
         let sent = 0;
         while (blockheight < lastValidBlockHeight && sent < timesToSend) {
             yield connection.sendRawTransaction(serialized, {
                 skipPreflight: true,
+                maxRetries: 1000,
             });
             yield sleep(300);
             blockheight = yield connection.getBlockHeight();
@@ -7603,11 +7618,11 @@ function txToV0(transaction, payer, blockhash) {
         return new VersionedTransaction(v0Message);
     }
 }
-function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false, convertIntoTxV0 = true) {
+function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false, convertIntoTxV0 = true, rpcCalls = 5) {
     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 = [];
@@ -7623,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")}`);
                     }
                 }
             })));
@@ -7639,7 +7653,7 @@ function sendAll(connection, wallet, transactions, signers, waitBetweenSend, ski
                 const serialized = buffer.Buffer.from(signedTx.serialize());
                 if (debug)
                     console.debug(serialized.toString("base64"));
-                return sendWithRetries(connection, serialized, lastValidBlockHeight);
+                return sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls);
             }));
         }
         else {
@@ -7654,20 +7668,19 @@ 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());
                 if (debug)
                     console.debug(serialized.toString("base64"));
-                txIds.push(yield sendWithRetries(connection, serialized, lastValidBlockHeight));
+                txIds.push(yield sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls));
                 yield sleep(waitBetweenSend);
             }
         }
@@ -7677,6 +7690,7 @@ function sendAll(connection, wallet, transactions, signers, waitBetweenSend, ski
 
 var helpers = /*#__PURE__*/Object.freeze({
 	__proto__: null,
+	getAccountInfo: getAccountInfo,
 	hexToBuffer: hexToBuffer,
 	bufferToHex: bufferToHex,
 	sleep: sleep,