@haven-fi/solauto-sdk 1.0.409 → 1.0.410

package/dist/utils/jitoUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAmND,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAwF/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAqND,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAwF/B"}

package/dist/utils/jitoUtils.js

@@ -108,8 +108,10 @@ async function simulateJitoBundle(umi, txs) {
     return transactionResults;
 }
 async function umiToVersionedTransactions(umi, blockhash, signer, txs, sign, feeEstimates, computeUnitLimits) {
-    let builtTxs = await Promise.all(txs.map(async (tx, i) => {
-        return await (0, solanaUtils_1.assembleFinalTransaction)(signer, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined).buildWithLatestBlockhash(umi);
+    let builtTxs = await Promise.all([...txs].map(async (tx, i) => {
+        return (0, solanaUtils_1.assembleFinalTransaction)(signer, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined)
+            .setBlockhash(blockhash)
+            .build(umi);
     }));
     if (sign) {
         builtTxs = await signer.signAllTransactions(builtTxs);
@@ -189,12 +191,12 @@ async function sendJitoBundledTransactions(umi, connection, signer, txs, txType,
     let builtTxs;
     let simulationResults;
     if (txType !== "skip-simulation") {
-        builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, signer, txs, true, // REVERT ME
-        feeEstimates);
+        builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, signer, txs, false, feeEstimates);
         (0, generalUtils_1.consoleLog)(builtTxs.map((x) => x.message.compiledInstructions.map((y) => x.message.staticAccountKeys[y.programIdIndex].toString())));
         simulationResults = await simulateJitoBundle(umi, builtTxs);
     }
     if (txType !== "only-simulate") {
+        onAwaitingSign?.();
         builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, signer, txs, true, feeEstimates, simulationResults
             ? simulationResults.map((x) => x.unitsConsumed * 1.15)
             : undefined);
@@ -202,7 +204,6 @@ async function sendJitoBundledTransactions(umi, connection, signer, txs, txType,
         if (serializedTxs.find((x) => x.length > 1232)) {
             throw new Error("A transaction is too large");
         }
-        onAwaitingSign?.();
         const txSigs = await sendJitoBundle(umi, serializedTxs.map((x) => bs58_1.default.encode(x)));
         return txSigs.length > 0 ? txSigs : undefined;
     }

package/local/logPositions.ts

@@ -14,14 +14,14 @@ import {
   TOKEN_INFO,
   USD_DECIMALS,
 } from "../src";
-import { PublicKey } from "@solana/web3.js";
+import { PublicKey, VersionedTransaction } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { fromBaseUnit } from "../dist";
-import path from 'path';
-import { config } from 'dotenv';
+import path from "path";
+import { config } from "dotenv";
 
-config({ path: path.join(__dirname, '.env') });
+config({ path: path.join(__dirname, ".env") });
 
 function getBatches<T>(items: T[], batchSize: number): T[][] {
   const batches: T[][] = [];
@@ -221,5 +221,35 @@ async function main(filterWhitelist: boolean) {
   console.log(`Total TVL: $${formatNumber(tvl, 2, 10000, 2)}`);
 }
 
-const filterWhitelist = true;
-main(filterWhitelist).then((x) => x);
+import { Transaction } from "@solana/web3.js";
+import * as bs58 from "bs58";
+
+function decodeVersionedTx(base58Tx: string) {
+  // 1) Decode base58 into raw bytes
+  const txBuffer = bs58.decode(base58Tx);
+
+  // 2) Parse as versioned transaction
+  const versionedTx = VersionedTransaction.deserialize(txBuffer);
+
+  // 3) Extract signatures or do other things with `versionedTx`
+  const signatures = versionedTx.signatures.map((sigBytes, index) => ({
+    index,
+    signature: bs58.encode(sigBytes), // convert signature bytes to base58 string
+  }));
+
+  return { versionedTx, signatures };
+}
+
+// const filterWhitelist = true;
+// main(filterWhitelist).then((x) => x);
+
+console.log(
+  decodeVersionedTx(
+    "2APHUzQFJw5DtKwyYLEpzLazJHHgpF2XBWtghsb5MpZp1hEcdYvUvkrURPtAvf187t2TMNQPiuA1aQ6iMmT76xGUbNXAoNHjnyp8sJsLfMw3e9o8zhq2u97EsW4ceHTHE5EMWJWjXD4wWBDvVGMThr4G3nbWoCPUYbkT37sdZta9hwZfCcntxZN3o94Un4iQhqzeC3dRXiqZvPawNTBn4ybrD5HxsGyW61FJZNUtPTMdjqy3au2mMR1RWNp8CKAK8DTvx5n32fbRazH88ZqzJYfnny53fFyg6inktoUsNCiYWB1aEpLBs6BpDm7ZXxHDEkYNcZJXA6srCuUqKU3zLqRH2djVfMxhWuMc4RZBwEb863RkD7HEMdHFLpFdLRG2NKz7kET4A6hoj8j3iEJJPR7j38RRuPNf5pnxMoswGDNubYhGwM2zf73bj2MfWSWUB1gLpcEtq1j9YEAr86vLzGEeyjEKoCgo2UxwmkXHZr6xs18hcQNsKkWBHRgcgNw8MC7BmCBsWbZqiTK9jLCA4APNnhDEeH2wz6uPBwbfehVfjtzX7oJffSNm75Hjw8ti7FC2yJzbZWJdgydKGN8Lew6tci4Zuiwkq4ghXbokZVr9q9V17GXjhLQVYaAfYsip6conz9Nuh42u2R9kVD7ByeeMDBowu98qy8LgbqyswsZQPW3rJB11caZFqka7eZC9o9JTzjrwhiXVNm7ZY9uuzvppPtd577TekxRVsUVzdW9qaSmLc8QzzRAkav9iNKnqCHhSegpUUXKgSPBnFJ2pbmw1XMuLBRqmvsyj3Hev6axUenj6fHuV27Ki8mcGzXks4LkioBWDMrK8ccwnG5FV"
+  )
+);
+console.log(
+  decodeVersionedTx(
+    "5KqMfqNHtEhb2FLQYPCzFKC97r5kzkvgQCk8gq1LDLZiXmLqdY5LqMSs5s4mhTc3zQLwkRyot23KDLrjVFPSavbN96qXrYwppNTT7SV7irvvtbWzkSVL8kh4fEWMADeEAWH2zNnrYVLDmboASUrmYRxf3UryVZXnG4LKabcouinNiFBtvgQW8KbG8ZHwzkYS9BQMQgGdrugPq5jgVVkPEF95tQiudYC7K9nmcARJvTckd6SoumAfyYDHMuZPjGHGZNanJwD2wjV2uD9Loym5HUtkk4rhnVV2CmBngaHMY5xgxWDZCX4c5vgimyRmbhQ3m1u4YGhx9FYG8ftt7bj36zNcKGGGrS1nPzRfEBs9bwWSjvW9efKKGDnV24cJXxMR3i7mYj1kzcbNpyHKdYkEk1UCVvDDQaNCxahBKXGqM9KRo3X4WrtBCQbNbo9bQSEmCUN4KDumTzTL9buwtoqdP1Ej1SZj8zqTxhVnp9BkX1hXwz6UBk7mUvC5kRjDS8Gsm2C61bfo4XME9JfhP3SvifndbJHDFQxs4TcGEP1PGr4CghwPEWP4bKTjbzs6NL4HiX7aohQTUNuZzr4425ae5UsH8WtaihwYPZXaQgmgFraHJumNUyxrYVrqpHNn2TpoQDGNBrsAEThGWzqf3KXV8WhoRfFtZAXFzf3oBi4bAaqoJnMkPfa2DjLtJY6iutaSNVx1jokhCpEgRBdoMp8nGcMJHDTNALFu6XMMVcLBV3d7FrGtoWUghn7iAWUVSw75VcjTZR7ucEGBYuj9zdrXgMDoUmSGzjoZqiArbgAUd5YM5J6o5QkkDFPUj8WWLFtaSp8iSGBuu6bG5ek5jQFu38NZq1WxMiJrYffTAtKvjkThS8kPAD2xSRWbwSbrwYe7WZBZEUVyUQYRBp4evEeVczYwaFHd47uHJFYpSipkiET9cjoZPmKtMuEpL1BxZTXpnM4GrHM8ihdUGDpDGZ5kGyzTLtoA9D4iz1R5Pn3hxHqi57UH1YzGMfVUGEbG2n9otvFAFKPFYbHTzggGGUFXMdM2BN6VBxQAD6eJQ53ztepXozz5PvALowbT5KorzLHZSBDZbqWNyP9jw5pkrYnGvNYpsx7x4NjNpBeFJft4UZRnUxrfDqop4qgURaPhFtQPGrSXwBjZqUpHcCYbJdWJwgQ54yUinuNB9mGFidFxiAPfCm5H9mdLExmw6bXh3UUXzxC1ffA6uv91Qjxtk5VgBiyoSzzejuPMN7n8K4W8W1V1E18pu5QJ2pa1pxFchDz15U4QHCjsYpbu4bPKP5WTeUER5U5wXC18ht5j9nZVHZfciMQszfFYmybDgtUg8mvRJXtnTrzZ8H62TUD11TLpyqXsZGWuFTFTsxv2tLFx1QXawA8xJbZ5HCbyXJi6no8W4VWcG3sgyZKHBRKTUTzY2BmgrKDQDbViSrxyteGtpV47RYm5czX29VmQJTMQNKQWYmLrdbrf8ZQWcZKK1HgbQvBr1VvQCMMMkw9J6b7VBxYxBx"
+  )
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.409",
+  "version": "1.0.410",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/utils/jitoUtils.ts

@@ -162,13 +162,15 @@ async function umiToVersionedTransactions(
   computeUnitLimits?: number[]
 ): Promise<VersionedTransaction[]> {
   let builtTxs = await Promise.all(
-    txs.map(async (tx, i) => {
-      return await assembleFinalTransaction(
+    [...txs].map(async (tx, i) => {
+      return assembleFinalTransaction(
         signer,
         tx,
         feeEstimates ? feeEstimates[i] : undefined,
         computeUnitLimits ? computeUnitLimits[i] : undefined
-      ).buildWithLatestBlockhash(umi);
+      )
+        .setBlockhash(blockhash)
+        .build(umi);
     })
   );
 
@@ -306,7 +308,7 @@ export async function sendJitoBundledTransactions(
       latestBlockhash,
       signer,
       txs,
-      true, // REVERT ME
+      false,
       feeEstimates
     );
     consoleLog(
@@ -320,6 +322,7 @@ export async function sendJitoBundledTransactions(
   }
 
   if (txType !== "only-simulate") {
+    onAwaitingSign?.();
     builtTxs = await umiToVersionedTransactions(
       umi,
       latestBlockhash,
@@ -337,7 +340,6 @@ export async function sendJitoBundledTransactions(
       throw new Error("A transaction is too large");
     }
 
-    onAwaitingSign?.();
     const txSigs = await sendJitoBundle(
       umi,
       serializedTxs.map((x) => base58.encode(x))