@haven-fi/solauto-sdk 1.0.409 → 1.0.411

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,CA+F/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);
@@ -186,15 +188,18 @@ async function sendJitoBundledTransactions(umi, connection, signer, txs, txType,
         ? await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting, true)) ?? 1000000))
         : undefined;
     const latestBlockhash = (await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })).blockhash;
+    console.log("Signers expected:", txs.forEach((tx) => {
+        tx.getSigners(umi).map(x => x.publicKey.toString());
+    }));
     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 +207,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(
+    "26feCSuaGDro5UJdiew6EzpQBxQhpGVkPiZ6DR8Qjdtgf3PPNPtqwRKaxV5fHfoCmcAkw1vLeXTAVo9u1qyb8g2SupHtY61Z15n1fCrsdyMVGwVboU5LDzvWLuHp7P5BqFmccXRNenWu3vF6mw5qb9em4sS9poAHBUu5Hiysyi637Dy4bWq3z1wQokkeZPdgw4jvTmKnfZQK4epvJVffMWELaJ4cPYden9meiUD7Drrk2ELaoFX4WZA8DWcB9QAY2xmguRXn1Agjp4i7vmwFHBENozWDYQiGpfztUXToE8kjrVuPoFWbCZbvvF4jpHroMr6d5bfBaU6LtdbLYfRdV8vxZkJ31tcnyGiHJJFBre6orZV8hgdVkGFMhPyb7uermCXbe4gvrH7geAUxWBznUkfWsKazYxMrQ741HVrkUfioZeXc9BtioTS3KSoFisCqVNkeGMYU3RPk6f6rvCen93JkbSrK1mG8NapnVuW6FBgKniGKd3Cktu1YxCNS27WHtQhgoav9crQqLBBNNZArqeJQ6Pd39pC7YgdMXaUWKtYticx6wx78brVPcaexDSYuwrcDSrzMDKdQdgRNRBQgDRTfR9qGN1oVKNVzpYfNWPvyy8ZYnpUQrX1xV9P3uhZv1A9GSV7C1YKBtsRxyaibw57V4YKLqC451tkshVKek6UVY6g6CeF7XKGeagiCAxr6JCgdYpwDJ6yCz62rcfqSb7X4MXb3zEgUGfRuaGsh4daRjZk7QyjU6C9xfe16Prv9DTJT3kKkEzhiuVbLthdBVYB6nMg2NjPuDAvvrUd56MsA2akNQiXYG9iN6YeGccNtJRCat5SJpLUfUCQMZSf1"
+  )
+);
+console.log(
+  decodeVersionedTx(
+    "LqSqbJDbCJqgxRq1YXyj2juUdMHCsC71fE2hxWHC7RxEE81AfA6rSkCLJfJa2mijAqRfwgv3pJ5txmrmQPbbHf3E3MYVkB4nq8sJnsc1LWVhnBZtvYuyET8t5TTeUK4HrAfdckm6jXvWQ37B544PXagREoPUsiCepmi4Xxd1PojaRJAPEPLWmx46pFvQRPrvZXQfUDmLVd7KLTZy5dw7HMRh4otrwzgCKeVo291d7rqBu6dwFaKM96ynNADT4G5yfucQqwy71YCFkGsxTKqqSBtvQnkSRRH1GzHgTS1ASTnkja89AUbjrSeaExM1YjN4YGjKc3KLVNiHFUFCZFfwhiarL6kgLRBCjGQzEwvasvE6DykvHJSoBPEUe2dqFwc3Zr7NJx7oqiQCcLuu3nr72WKEbBm4xx522pzn7xnswyJhUGtkgg68XTJhcQsV8U8gHSp22FsXgkb4cooJ3wNSsQiXmdvkQTVbTvE8E6M9zbuvQeNYigWH5mfq99CHkJBWY8qujucktZfJfpcwpd5FeqmuwLqahky8NhRKkDKZ3G4DfGAVC319NDVC4sLbtyhEMinvAuGFFJaPYTduu4q2EDU6tc41DYDZS5iX3NKy4DcHJy4FpdTNZdERzrvz3Pm1qUSETUBLuJVxsUQeqmwcCCvoQkEzTKgdJHsDr3AiRT8fJgBi1JdFSUuzsJzF8GDX9nkTMgr7iu4ueNQD3NjLtzQ68RxfZGKJD5GhXN7B6w8EoX7mztRFpraAmgNxGTQcbud2v9zsrsyHHpqPESvt9N3nJ5Wu5DVZJLxuJ5ACQMYLNSgt1DVAe1d9TZpxNSnoTzcGJPCibC8GKTLm9my4DHeVifpTPpSqtNNudFm7kwsrdMLLoSS2WWkGhZq9GCXYbZTuMMxzHmnLCr4sYz5MHxEftA9pxzVBDsExzTg2g5ECGHddDhcxzdBNT5y29qdmQ2oZ84vUDkS7HZUP1qEFTFQY87ze6LeqgyGtjo1nzj53appZz9SLgdGKndf2cv498ue6oLhNbbcDwPiz3yb3pLRzKzVp7UPHaVbDrivJw7VB1ekXAHN21i5x5yaMzqNYsPiA6A242ZS591ruznaMP9EQYnuqYTSmFdWcfEfPDNje5FavMxZdwKkWDwGdUZJcgf6f9wzSMKPYXFvgcNGdufJTiM5YRA4KAMWQFLYhme4QXxUYMvqZmUk2biWJP7n1Rn7s4Mxd1RJtiAAhKz8SZR7g1im7dgD2pZAo6568eJC1V42Z8KvCJ1u8o12k16aHwKtDacYUWopQFYHzMnbTLj45euFPDA6AKnNXia3azB5geQDqD41qkRu3hBfnrUpA2a5Y1RvkwnR6VpnfuHV1Qyhpdnpb75mbGMvccDNE1V8wwwMsXUPtp26E71FsYBrDCDnBZZHMaHoN68dtguLAnyXYb2VDumNKWHKKVRY91ZmwYUxcPXpf6AuQzah"
+  )
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.409",
+  "version": "1.0.411",
   "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);
     })
   );
 
@@ -298,6 +300,13 @@ export async function sendJitoBundledTransactions(
     await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })
   ).blockhash;
 
+  console.log(
+    "Signers expected:",
+    txs.forEach((tx) => {
+      tx.getSigners(umi).map(x => x.publicKey.toString());
+    })
+  );
+
   let builtTxs: VersionedTransaction[];
   let simulationResults: SimulatedTransactionResponse[] | undefined;
   if (txType !== "skip-simulation") {
@@ -306,7 +315,7 @@ export async function sendJitoBundledTransactions(
       latestBlockhash,
       signer,
       txs,
-      true, // REVERT ME
+      false,
       feeEstimates
     );
     consoleLog(
@@ -320,6 +329,7 @@ export async function sendJitoBundledTransactions(
   }
 
   if (txType !== "only-simulate") {
+    onAwaitingSign?.();
     builtTxs = await umiToVersionedTransactions(
       umi,
       latestBlockhash,
@@ -337,7 +347,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))