@haven-fi/solauto-sdk 1.0.816 → 1.0.818

package/dist/services/transactions/manager/clientTransactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientTransactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/clientTransactionsManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAQ5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAmClD"}
+{"version":3,"file":"clientTransactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/clientTransactionsManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAI5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAmClD"}

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/solanaUtils.js

@@ -112,7 +112,12 @@ function prependTx(tx, txsToAdd) {
     const keccakIdx = instructions.findIndex((x) => x.programId.toString() === "KeccakSecp256k11111111111111111111111111111");
     if (keccakIdx !== -1) {
         const [beforeKeccak, afterKeccak] = tx.splitByIndex(keccakIdx + 1);
-        let finalTx = (0, umi_1.transactionBuilder)().add(beforeKeccak);
+        // IMPORTANT: Preserve lookup tables from original transaction
+        const lookupTables = tx.options.addressLookupTables ?? [];
+        (0, generalUtils_1.consoleLog)(`[prependTx] Keccak branch - preserving ${lookupTables.length} lookup tables`);
+        let finalTx = (0, umi_1.transactionBuilder)()
+            .setAddressLookupTables(lookupTables)
+            .add(beforeKeccak);
         for (const txToAdd of txsToAdd) {
             finalTx = finalTx.append(txToAdd);
         }
@@ -142,11 +147,12 @@ function getActualTxSize(umi, tx) {
         const web3Tx = (0, umi_web3js_adapters_1.toWeb3JsTransaction)(builtTx);
         // Actually serialize to get the real size
         const serialized = web3Tx.serialize();
+        (0, generalUtils_1.consoleLog)("[getActualTxSize] Serialization successful, size:", serialized.length);
         return serialized.length;
     }
     catch (e) {
         // Serialization failed - transaction is too large or malformed
-        (0, generalUtils_1.consoleLog)("Transaction serialization check failed:", e);
+        (0, generalUtils_1.consoleLog)("[getActualTxSize] Serialization FAILED:", e?.message || e);
         return undefined;
     }
 }
@@ -155,13 +161,19 @@ function getActualTxSize(umi, tx) {
  * More accurate than getTransactionSize() estimation.
  */
 function canSerializeTransaction(umi, tx, buffer = 0) {
+    (0, generalUtils_1.consoleLog)("[canSerializeTransaction] Checking with buffer:", buffer);
     const size = getActualTxSize(umi, tx);
     if (size === undefined) {
+        (0, generalUtils_1.consoleLog)("[canSerializeTransaction] Failed - size undefined");
         return false;
     }
-    return size + buffer <= MAX_TX_SIZE;
+    const fits = size + buffer <= MAX_TX_SIZE;
+    (0, generalUtils_1.consoleLog)(`[canSerializeTransaction] Size: ${size}, buffer: ${buffer}, max: ${MAX_TX_SIZE}, fits: ${fits}`);
+    return fits;
 }
 function addTxOptimizations(umi, tx, computeUnitPrice, computeUnitLimit) {
+    (0, generalUtils_1.consoleLog)(`[addTxOptimizations] Called with price=${computeUnitPrice}, limit=${computeUnitLimit}`);
+    (0, generalUtils_1.consoleLog)(`[addTxOptimizations] Input tx estimated size: ${tx.getTransactionSize(umi)}`);
     const computePriceIx = computeUnitPrice !== undefined
         ? setComputeUnitPriceUmiIx(umi.identity, computeUnitPrice)
         : (0, umi_1.transactionBuilder)();
@@ -171,22 +183,31 @@ function addTxOptimizations(umi, tx, computeUnitPrice, computeUnitLimit) {
     const allOptimizations = tx.prepend(computePriceIx).prepend(computeLimitIx);
     const withCuPrice = tx.prepend(computePriceIx);
     const withCuLimit = tx.prepend(computeLimitIx);
+    (0, generalUtils_1.consoleLog)("[addTxOptimizations] Checking if all optimizations fit...");
     // Use actual serialization check instead of estimate
     if (canSerializeTransaction(umi, allOptimizations)) {
+        (0, generalUtils_1.consoleLog)("[addTxOptimizations] All optimizations fit, adding both");
         return prependTx(tx, [computePriceIx, computeLimitIx]);
     }
-    else if (canSerializeTransaction(umi, withCuPrice)) {
+    (0, generalUtils_1.consoleLog)("[addTxOptimizations] Checking if just CU price fits...");
+    if (canSerializeTransaction(umi, withCuPrice)) {
+        (0, generalUtils_1.consoleLog)("[addTxOptimizations] Only CU price fits, adding it");
         return prependTx(tx, [computePriceIx]);
     }
-    else if (canSerializeTransaction(umi, withCuLimit)) {
+    (0, generalUtils_1.consoleLog)("[addTxOptimizations] Checking if just CU limit fits...");
+    if (canSerializeTransaction(umi, withCuLimit)) {
+        (0, generalUtils_1.consoleLog)("[addTxOptimizations] Only CU limit fits, adding it");
         return prependTx(tx, [computeLimitIx]);
     }
-    else {
-        return tx;
-    }
+    (0, generalUtils_1.consoleLog)("[addTxOptimizations] Nothing fits, returning original tx");
+    return tx;
 }
 function assembleFinalTransaction(umi, transaction, computeUnitPrice, computeUnitLimit) {
+    (0, generalUtils_1.consoleLog)(`[assembleFinalTransaction] Input tx instructions: ${transaction.getInstructions().length}`);
+    (0, generalUtils_1.consoleLog)(`[assembleFinalTransaction] Input tx estimated size: ${transaction.getTransactionSize(umi)}`);
     const tx = addTxOptimizations(umi, transaction, computeUnitPrice, computeUnitLimit);
+    (0, generalUtils_1.consoleLog)(`[assembleFinalTransaction] After optimizations, instructions: ${tx.getInstructions().length}`);
+    (0, generalUtils_1.consoleLog)(`[assembleFinalTransaction] After optimizations, estimated size: ${tx.getTransactionSize(umi)}`);
     const marginfiStartFlSerializer = (0, marginfi_1.getLendingAccountStartFlashloanInstructionDataSerializer)();
     const marginfiStartFlDiscriminator = marginfiStartFlSerializer
         .serialize({
@@ -220,10 +241,46 @@ function assembleFinalTransaction(umi, transaction, computeUnitPrice, computeUni
         }
         catch { }
     }
+    (0, generalUtils_1.consoleLog)(`[assembleFinalTransaction] Final tx estimated size: ${tx.getTransactionSize(umi)}`);
     return tx;
 }
 async function simulateTransaction(umi, connection, transaction) {
-    const simulationResult = await connection.simulateTransaction((0, umi_web3js_adapters_1.toWeb3JsTransaction)(transaction.build(umi)), {
+    (0, generalUtils_1.consoleLog)("[simulateTransaction] Building transaction...");
+    (0, generalUtils_1.consoleLog)("[simulateTransaction] Estimated size:", transaction.getTransactionSize(umi));
+    (0, generalUtils_1.consoleLog)("[simulateTransaction] Instructions:", transaction.getInstructions().length);
+    let builtTx;
+    try {
+        builtTx = transaction.build(umi);
+        (0, generalUtils_1.consoleLog)("[simulateTransaction] Built UMI transaction successfully");
+    }
+    catch (e) {
+        (0, generalUtils_1.consoleLog)("[simulateTransaction] Failed to build UMI transaction:", e);
+        throw e;
+    }
+    let web3Tx;
+    try {
+        web3Tx = (0, umi_web3js_adapters_1.toWeb3JsTransaction)(builtTx);
+        (0, generalUtils_1.consoleLog)("[simulateTransaction] Converted to web3.js transaction");
+    }
+    catch (e) {
+        (0, generalUtils_1.consoleLog)("[simulateTransaction] Failed to convert to web3.js:", e);
+        throw e;
+    }
+    // Try to serialize before simulation to catch the error with better context
+    try {
+        const serialized = web3Tx.serialize();
+        (0, generalUtils_1.consoleLog)("[simulateTransaction] Pre-serialization successful, size:", serialized.length);
+    }
+    catch (e) {
+        (0, generalUtils_1.consoleLog)("[simulateTransaction] Pre-serialization FAILED:", e);
+        (0, generalUtils_1.consoleLog)("[simulateTransaction] Message accounts:", web3Tx.message.staticAccountKeys.length);
+        (0, generalUtils_1.consoleLog)("[simulateTransaction] Message instructions:", web3Tx.message.compiledInstructions.length);
+        if ("addressTableLookups" in web3Tx.message) {
+            (0, generalUtils_1.consoleLog)("[simulateTransaction] Address table lookups:", web3Tx.message.addressTableLookups?.length ?? 0);
+        }
+        throw new Error(`Transaction serialization failed before simulation: ${e.message || e}`);
+    }
+    const simulationResult = await connection.simulateTransaction(web3Tx, {
         sigVerify: false,
         commitment: "confirmed",
     });

package/package.json

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

package/src/services/transactions/manager/clientTransactionsManager.ts

@@ -5,10 +5,6 @@ import {
 import { SolautoClient } from "../../solauto";
 import { TransactionsManager } from "./transactionsManager";
 import {
-  addSwbOraclePullTxs,
-  buildSwbSubmitResponseTx,
-  getSwitchboardFeedData,
-  isSwitchboardMint,
   retryWithExponentialBackoff,
 } from "../../../utils";
 import { TransactionItem } from "../types";

package/src/utils/solanaUtils.ts

@@ -220,7 +220,14 @@ export function prependTx(
   );
   if (keccakIdx !== -1) {
     const [beforeKeccak, afterKeccak] = tx.splitByIndex(keccakIdx + 1);
-    let finalTx = transactionBuilder().add(beforeKeccak);
+    // IMPORTANT: Preserve lookup tables from original transaction
+    const lookupTables = tx.options.addressLookupTables ?? [];
+    consoleLog(
+      `[prependTx] Keccak branch - preserving ${lookupTables.length} lookup tables`
+    );
+    let finalTx = transactionBuilder()
+      .setAddressLookupTables(lookupTables)
+      .add(beforeKeccak);
     for (const txToAdd of txsToAdd) {
       finalTx = finalTx.append(txToAdd);
     }
@@ -255,10 +262,11 @@ export function getActualTxSize(
     const web3Tx = toWeb3JsTransaction(builtTx);
     // Actually serialize to get the real size
     const serialized = web3Tx.serialize();
+    consoleLog("[getActualTxSize] Serialization successful, size:", serialized.length);
     return serialized.length;
-  } catch (e) {
+  } catch (e: any) {
     // Serialization failed - transaction is too large or malformed
-    consoleLog("Transaction serialization check failed:", e);
+    consoleLog("[getActualTxSize] Serialization FAILED:", e?.message || e);
     return undefined;
   }
 }
@@ -272,11 +280,17 @@ export function canSerializeTransaction(
   tx: TransactionBuilder,
   buffer: number = 0
 ): boolean {
+  consoleLog("[canSerializeTransaction] Checking with buffer:", buffer);
   const size = getActualTxSize(umi, tx);
   if (size === undefined) {
+    consoleLog("[canSerializeTransaction] Failed - size undefined");
     return false;
   }
-  return size + buffer <= MAX_TX_SIZE;
+  const fits = size + buffer <= MAX_TX_SIZE;
+  consoleLog(
+    `[canSerializeTransaction] Size: ${size}, buffer: ${buffer}, max: ${MAX_TX_SIZE}, fits: ${fits}`
+  );
+  return fits;
 }
 
 export function addTxOptimizations(
@@ -285,6 +299,13 @@ export function addTxOptimizations(
   computeUnitPrice?: number,
   computeUnitLimit?: number
 ) {
+  consoleLog(
+    `[addTxOptimizations] Called with price=${computeUnitPrice}, limit=${computeUnitLimit}`
+  );
+  consoleLog(
+    `[addTxOptimizations] Input tx estimated size: ${tx.getTransactionSize(umi)}`
+  );
+
   const computePriceIx =
     computeUnitPrice !== undefined
       ? setComputeUnitPriceUmiIx(umi.identity, computeUnitPrice)
@@ -296,17 +317,25 @@ export function addTxOptimizations(
   const allOptimizations = tx.prepend(computePriceIx).prepend(computeLimitIx);
   const withCuPrice = tx.prepend(computePriceIx);
   const withCuLimit = tx.prepend(computeLimitIx);
-  
+
+  consoleLog("[addTxOptimizations] Checking if all optimizations fit...");
   // Use actual serialization check instead of estimate
   if (canSerializeTransaction(umi, allOptimizations)) {
+    consoleLog("[addTxOptimizations] All optimizations fit, adding both");
     return prependTx(tx, [computePriceIx, computeLimitIx]);
-  } else if (canSerializeTransaction(umi, withCuPrice)) {
+  }
+  consoleLog("[addTxOptimizations] Checking if just CU price fits...");
+  if (canSerializeTransaction(umi, withCuPrice)) {
+    consoleLog("[addTxOptimizations] Only CU price fits, adding it");
     return prependTx(tx, [computePriceIx]);
-  } else if (canSerializeTransaction(umi, withCuLimit)) {
+  }
+  consoleLog("[addTxOptimizations] Checking if just CU limit fits...");
+  if (canSerializeTransaction(umi, withCuLimit)) {
+    consoleLog("[addTxOptimizations] Only CU limit fits, adding it");
     return prependTx(tx, [computeLimitIx]);
-  } else {
-    return tx;
   }
+  consoleLog("[addTxOptimizations] Nothing fits, returning original tx");
+  return tx;
 }
 
 export function assembleFinalTransaction(
@@ -315,6 +344,13 @@ export function assembleFinalTransaction(
   computeUnitPrice?: number,
   computeUnitLimit?: number
 ) {
+  consoleLog(
+    `[assembleFinalTransaction] Input tx instructions: ${transaction.getInstructions().length}`
+  );
+  consoleLog(
+    `[assembleFinalTransaction] Input tx estimated size: ${transaction.getTransactionSize(umi)}`
+  );
+
   const tx = addTxOptimizations(
     umi,
     transaction,
@@ -322,6 +358,13 @@ export function assembleFinalTransaction(
     computeUnitLimit
   );
 
+  consoleLog(
+    `[assembleFinalTransaction] After optimizations, instructions: ${tx.getInstructions().length}`
+  );
+  consoleLog(
+    `[assembleFinalTransaction] After optimizations, estimated size: ${tx.getTransactionSize(umi)}`
+  );
+
   const marginfiStartFlSerializer =
     getLendingAccountStartFlashloanInstructionDataSerializer();
   const marginfiStartFlDiscriminator = marginfiStartFlSerializer
@@ -371,6 +414,9 @@ export function assembleFinalTransaction(
     } catch {}
   }
 
+  consoleLog(
+    `[assembleFinalTransaction] Final tx estimated size: ${tx.getTransactionSize(umi)}`
+  );
   return tx;
 }
 
@@ -379,13 +425,66 @@ async function simulateTransaction(
   connection: Connection,
   transaction: TransactionBuilder
 ): Promise<RpcResponseAndContext<SimulatedTransactionResponse>> {
-  const simulationResult = await connection.simulateTransaction(
-    toWeb3JsTransaction(transaction.build(umi)),
-    {
-      sigVerify: false,
-      commitment: "confirmed",
-    }
+  consoleLog("[simulateTransaction] Building transaction...");
+  consoleLog(
+    "[simulateTransaction] Estimated size:",
+    transaction.getTransactionSize(umi)
   );
+  consoleLog(
+    "[simulateTransaction] Instructions:",
+    transaction.getInstructions().length
+  );
+
+  let builtTx;
+  try {
+    builtTx = transaction.build(umi);
+    consoleLog("[simulateTransaction] Built UMI transaction successfully");
+  } catch (e: any) {
+    consoleLog("[simulateTransaction] Failed to build UMI transaction:", e);
+    throw e;
+  }
+
+  let web3Tx;
+  try {
+    web3Tx = toWeb3JsTransaction(builtTx);
+    consoleLog("[simulateTransaction] Converted to web3.js transaction");
+  } catch (e: any) {
+    consoleLog("[simulateTransaction] Failed to convert to web3.js:", e);
+    throw e;
+  }
+
+  // Try to serialize before simulation to catch the error with better context
+  try {
+    const serialized = web3Tx.serialize();
+    consoleLog(
+      "[simulateTransaction] Pre-serialization successful, size:",
+      serialized.length
+    );
+  } catch (e: any) {
+    consoleLog("[simulateTransaction] Pre-serialization FAILED:", e);
+    consoleLog(
+      "[simulateTransaction] Message accounts:",
+      web3Tx.message.staticAccountKeys.length
+    );
+    consoleLog(
+      "[simulateTransaction] Message instructions:",
+      web3Tx.message.compiledInstructions.length
+    );
+    if ("addressTableLookups" in web3Tx.message) {
+      consoleLog(
+        "[simulateTransaction] Address table lookups:",
+        (web3Tx.message as any).addressTableLookups?.length ?? 0
+      );
+    }
+    throw new Error(
+      `Transaction serialization failed before simulation: ${e.message || e}`
+    );
+  }
+
+  const simulationResult = await connection.simulateTransaction(web3Tx, {
+    sigVerify: false,
+    commitment: "confirmed",
+  });
   if (simulationResult.value.err) {
     simulationResult.value.logs?.forEach((x: any) => {
       consoleLog(x);