@haven-fi/solauto-sdk 1.0.333 → 1.0.335

package/dist/transactions/transactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAW7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAyFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAXpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA4FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAmCxB,6BAA6B;YAmE7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAmD9B"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAW7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA0FD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAXpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA4FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAmCxB,6BAA6B;YA+E7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAmD9B"}

package/dist/transactions/transactionsManager.js

@@ -86,13 +86,13 @@ class TransactionSet {
             return false;
         }
         const singleTx = await this.getSingleTransaction();
-        return (0, solanaUtils_1.addTxOptimizations)(this.txHandler.umi.identity, singleTx, 1, 1)
+        const tx = (0, solanaUtils_1.addTxOptimizations)(this.txHandler.umi.identity, singleTx, 1, 1)
             .add(item.tx)
             .setAddressLookupTables(await this.lookupTables.getLutInputs([
             ...this.lutAddresses(),
             ...item.lookupTableAddresses,
-        ]))
-            .fitsInOneTransaction(this.txHandler.umi);
+        ]));
+        return tx.fitsInOneTransaction(this.txHandler.umi);
     }
     add(...items) {
         this.items.push(...items.filter((x) => x.tx && x.tx.getInstructions().length > 0));
@@ -349,14 +349,21 @@ class TransactionsManager {
                 transactions.push(await set.getSingleTransaction());
             }
             this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum);
-            const txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.signer, transactions, false, this.priorityFeeSetting);
-            if (Boolean(txSigs) && txSigs.length > 0) {
-                this.updateStatusForSets(itemSets, TransactionStatus.Successful, attemptNum, txSigs);
+            let txSigs;
+            let error;
+            try {
+                txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, transactions, this.txType, this.priorityFeeSetting);
             }
-            else {
-                this.updateStatusForSets(itemSets, TransactionStatus.Failed, attemptNum, txSigs, true);
-                throw new Error("Unknown error");
+            catch (e) {
+                error = e.message;
+            }
+            if (error || !Boolean(txSigs) || txSigs?.length === 0) {
+                this.updateStatusForSets(itemSets, TransactionStatus.Failed, attemptNum, txSigs, true, error);
+                if (error) {
+                    throw new Error(error ? error : "Unknown error");
+                }
             }
+            this.updateStatusForSets(itemSets, TransactionStatus.Successful, attemptNum, txSigs);
         }, this.retries, this.retryDelay, this.errorsToThrow).catch((e) => {
             this.updateStatusForSets(itemSets, TransactionStatus.Failed, num, undefined, true, e.message);
             throw e;

package/dist/utils/jitoUtils.d.ts

@@ -1,6 +1,6 @@
-import { PublicKey } from "@solana/web3.js";
+import { Connection, PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
-import { PriorityFeeSetting } from "../types";
+import { PriorityFeeSetting, TransactionRunType } from "../types";
 export declare function getRandomTipAccount(): Promise<PublicKey>;
-export declare function sendJitoBundledTransactions(umi: Umi, signer: Signer, txs: TransactionBuilder[], simulateOnly?: boolean, priorityFeeSetting?: PriorityFeeSetting): Promise<string[] | undefined>;
+export declare function sendJitoBundledTransactions(umi: Umi, connection: Connection, signer: Signer, txs: TransactionBuilder[], txType?: TransactionRunType, priorityFeeSetting?: PriorityFeeSetting): Promise<string[] | undefined>;
 //# sourceMappingURL=jitoUtils.d.ts.map

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;AAsHD,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,CAkD/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAG9E,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AASlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAwHD,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,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAyD/B"}

package/dist/utils/jitoUtils.js

@@ -13,6 +13,7 @@ const generalUtils_1 = require("./generalUtils");
 const types_1 = require("../types");
 const axios_1 = __importDefault(require("axios"));
 const bs58_1 = __importDefault(require("bs58"));
+const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
 async function getRandomTipAccount() {
     const tipAccounts = [
         "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
@@ -95,8 +96,11 @@ async function sendJitoBundle(transactions) {
         });
     }
     catch (e) {
-        if (e.response) {
+        if (e.response.data.error) {
             console.error("Jito send bundle error:", e.response.data.error);
+            throw new Error(e.response.data.error.message);
+        }
+        else {
             throw e;
         }
     }
@@ -104,7 +108,11 @@ async function sendJitoBundle(transactions) {
     (0, generalUtils_1.consoleLog)("Bundle ID:", bundleId);
     return bundleId ? await pollBundleStatus(bundleId) : [];
 }
-async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, priorityFeeSetting = types_1.PriorityFeeSetting.Min) {
+async function sendJitoBundledTransactions(umi, connection, signer, txs, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min) {
+    if (txs.length === 1) {
+        const res = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(umi, connection, txs[0], txType, priorityFeeSetting);
+        return res ? [bytes_1.bs58.encode(res)] : undefined;
+    }
     (0, generalUtils_1.consoleLog)("Sending Jito bundle...");
     (0, generalUtils_1.consoleLog)("Transactions: ", txs.length);
     (0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
@@ -115,11 +123,8 @@ async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, prior
         : undefined;
     let builtTxs = await umiToVersionedTransactions(umi, signer, txs, true, // false if simulating first and rebuilding later
     feeEstimates);
-    for (let i = 0; i < txs.length; i++) {
-        (0, generalUtils_1.consoleLog)("Transaction", i, txs[i].getInstructions());
-    }
     // const simulationResults = await simulateJitoBundle(umi, builtTxs);
-    if (!simulateOnly) {
+    if (txType !== "only-simulate") {
         // let builtTxs = await umiToVersionedTransactions(
         //   client.signer,
         //   txs,

package/package.json

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

package/src/transactions/transactionsManager.ts

@@ -136,15 +136,16 @@ class TransactionSet {
     }
 
     const singleTx = await this.getSingleTransaction();
-    return addTxOptimizations(this.txHandler.umi.identity, singleTx, 1, 1)
+    const tx = addTxOptimizations(this.txHandler.umi.identity, singleTx, 1, 1)
       .add(item.tx)
       .setAddressLookupTables(
         await this.lookupTables.getLutInputs([
           ...this.lutAddresses(),
           ...item.lookupTableAddresses,
         ])
-      )
-      .fitsInOneTransaction(this.txHandler.umi);
+      );
+
+    return tx.fitsInOneTransaction(this.txHandler.umi);
   }
 
   add(...items: TransactionItem[]) {
@@ -551,30 +552,42 @@ export class TransactionsManager {
           TransactionStatus.Processing,
           attemptNum
         );
-        const txSigs = await sendJitoBundledTransactions(
-          this.txHandler.umi,
-          this.txHandler.signer,
-          transactions,
-          false,
-          this.priorityFeeSetting
-        );
-        if (Boolean(txSigs) && txSigs!.length > 0) {
-          this.updateStatusForSets(
-            itemSets,
-            TransactionStatus.Successful,
-            attemptNum,
-            txSigs
+
+        let txSigs: string[] | undefined;
+        let error: string | undefined;
+        try {
+          txSigs = await sendJitoBundledTransactions(
+            this.txHandler.umi,
+            this.txHandler.connection,
+            this.txHandler.signer,
+            transactions,
+            this.txType,
+            this.priorityFeeSetting
           );
-        } else {
+        } catch (e: any) {
+          error = e.message;
+        }
+
+        if (error || !Boolean(txSigs) || txSigs?.length === 0) {
           this.updateStatusForSets(
             itemSets,
             TransactionStatus.Failed,
             attemptNum,
             txSigs,
-            true
+            true,
+            error
           );
-          throw new Error("Unknown error");
+          if (error) {
+            throw new Error(error ? error : "Unknown error");
+          }
         }
+
+        this.updateStatusForSets(
+          itemSets,
+          TransactionStatus.Successful,
+          attemptNum,
+          txSigs
+        );
       },
       this.retries,
       this.retryDelay,

package/src/utils/jitoUtils.ts

@@ -1,4 +1,4 @@
-import { PublicKey, VersionedTransaction } from "@solana/web3.js";
+import { Connection, PublicKey, VersionedTransaction } from "@solana/web3.js";
 import { toWeb3JsTransaction } from "@metaplex-foundation/umi-web3js-adapters";
 import { JITO_BLOCK_ENGINE } from "../constants/solautoConstants";
 import {
@@ -11,10 +11,11 @@ import {
   assembleFinalTransaction,
   buildIronforgeApiUrl,
   getComputeUnitPriceEstimate,
+  sendSingleOptimizedTransaction,
   systemTransferUmiIx,
 } from "./solanaUtils";
 import { consoleLog } from "./generalUtils";
-import { PriorityFeeSetting } from "../types";
+import { PriorityFeeSetting, TransactionRunType } from "../types";
 import axios from "axios";
 import base58 from "bs58";
 import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
@@ -139,8 +140,10 @@ async function sendJitoBundle(transactions: string[]): Promise<string[]> {
       }
     );
   } catch (e: any) {
-    if (e.response) {
+    if (e.response.data.error) {
       console.error("Jito send bundle error:", e.response.data.error);
+      throw new Error(e.response.data.error.message);
+    } else {
       throw e;
     }
   }
@@ -152,11 +155,23 @@ async function sendJitoBundle(transactions: string[]): Promise<string[]> {
 
 export async function sendJitoBundledTransactions(
   umi: Umi,
+  connection: Connection,
   signer: Signer,
   txs: TransactionBuilder[],
-  simulateOnly?: boolean,
+  txType?: TransactionRunType,
   priorityFeeSetting: PriorityFeeSetting = PriorityFeeSetting.Min
 ): Promise<string[] | undefined> {
+  if (txs.length === 1) {
+    const res = await sendSingleOptimizedTransaction(
+      umi,
+      connection,
+      txs[0],
+      txType,
+      priorityFeeSetting
+    );
+    return res ? [bs58.encode(res)] : undefined;
+  }
+
   consoleLog("Sending Jito bundle...");
   consoleLog("Transactions: ", txs.length);
   consoleLog(
@@ -184,13 +199,9 @@ export async function sendJitoBundledTransactions(
     feeEstimates
   );
 
-  for (let i = 0; i < txs.length; i++) {
-    consoleLog("Transaction", i, txs[i].getInstructions());
-  }
-
   // const simulationResults = await simulateJitoBundle(umi, builtTxs);
 
-  if (!simulateOnly) {
+  if (txType !== "only-simulate") {
     // let builtTxs = await umiToVersionedTransactions(
     //   client.signer,
     //   txs,