@haven-fi/solauto-sdk 1.0.314 → 1.0.316

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,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA0GD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAyC/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA8GD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA2C/B"}

package/dist/utils/jitoUtils.js

@@ -49,11 +49,14 @@ async function getTipInstruction(signer, tipLamports) {
 //     }
 //   );
 // }
-async function umiToVersionedTransactions(umi, signer, txs, feeEstimates, computeUnitLimits) {
-    return await Promise.all(txs.map(async (tx, i) => {
-        const versionedTx = (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await (0, solanaUtils_1.assembleFinalTransaction)(signer, tx, feeEstimates[i], computeUnitLimits ? computeUnitLimits[i] : undefined).setLatestBlockhash(umi)).buildAndSign(umi));
-        return versionedTx;
+async function umiToVersionedTransactions(umi, signer, txs, sign, feeEstimates, computeUnitLimits) {
+    const builtTxs = await Promise.all(txs.map(async (tx, i) => {
+        return (await (0, solanaUtils_1.assembleFinalTransaction)(signer, tx, feeEstimates[i], computeUnitLimits ? computeUnitLimits[i] : undefined).setLatestBlockhash(umi)).build(umi);
     }));
+    if (sign) {
+        await signer.signAllTransactions(builtTxs);
+    }
+    return builtTxs.map((x) => (0, umi_web3js_adapters_1.toWeb3JsTransaction)(x));
 }
 async function getBundleStatus(bundleId) {
     const res = await axios_1.default.post(`${solautoConstants_1.JITO_BLOCK_ENGINE}/api/v1/bundles`, {
@@ -99,12 +102,14 @@ async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, prior
     txs[0] = txs[0].prepend(await getTipInstruction(signer, 150000));
     const feeEstimates = await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting)) ??
         1000000));
-    let builtTxs = await umiToVersionedTransactions(umi, signer, txs, feeEstimates);
+    let builtTxs = await umiToVersionedTransactions(umi, signer, txs, true, // false if simulating first and rebuilding later
+    feeEstimates);
     // const simulationResults = await simulateJitoBundle(umi, builtTxs);
     if (!simulateOnly) {
         // let builtTxs = await umiToVersionedTransactions(
         //   client.signer,
         //   txs,
+        //   true,
         //   feeEstimates,
         //   simulationResults.map((x) => x.unitsConsumed! * 1.15)
         // );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.314",
+  "version": "1.0.316",
   "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

@@ -69,24 +69,28 @@ async function umiToVersionedTransactions(
   umi: Umi,
   signer: Signer,
   txs: TransactionBuilder[],
+  sign: boolean,
   feeEstimates: number[],
   computeUnitLimits?: number[]
 ): Promise<VersionedTransaction[]> {
-  return await Promise.all(
+  const builtTxs = await Promise.all(
     txs.map(async (tx, i) => {
-      const versionedTx = toWeb3JsTransaction(
-        await (
-          await assembleFinalTransaction(
-            signer,
-            tx,
-            feeEstimates[i],
-            computeUnitLimits ? computeUnitLimits[i] : undefined
-          ).setLatestBlockhash(umi)
-        ).buildAndSign(umi)
-      );
-      return versionedTx;
+      return (
+        await assembleFinalTransaction(
+          signer,
+          tx,
+          feeEstimates[i],
+          computeUnitLimits ? computeUnitLimits[i] : undefined
+        ).setLatestBlockhash(umi)
+      ).build(umi);
     })
   );
+
+  if (sign) {
+    await signer.signAllTransactions(builtTxs);
+  }
+
+  return builtTxs.map((x) => toWeb3JsTransaction(x));
 }
 
 async function getBundleStatus(bundleId: string) {
@@ -165,6 +169,7 @@ export async function sendJitoBundledTransactions(
     umi,
     signer,
     txs,
+    true, // false if simulating first and rebuilding later
     feeEstimates
   );
 
@@ -174,6 +179,7 @@ export async function sendJitoBundledTransactions(
     // let builtTxs = await umiToVersionedTransactions(
     //   client.signer,
     //   txs,
+    //   true,
     //   feeEstimates,
     //   simulationResults.map((x) => x.unitsConsumed! * 1.15)
     // );