@haven-fi/solauto-sdk 1.0.372 → 1.0.374

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

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAmBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA2LjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAoH7B;AA2LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBAkDzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA2H5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,oBAAoB,CAAC,EAAE,OAAO;;;;EAkExG"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAmBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA2LjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAoH7B;AA2LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBAqDzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA2H5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AA0BD,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,GAAG,EACV,oBAAoB,CAAC,EAAE,OAAO;;;;EAyE/B"}

package/dist/transactions/transactionUtils.js

@@ -439,6 +439,27 @@ async function convertReferralFeesToDestination(referralManager, tokenAccount, d
         .add(swapIx);
     return { tx, lookupTableAddresses };
 }
+function parseJitoErrorMessage(message) {
+    const regex = /Error processing Instruction (\d+): custom program error: (0x[0-9A-Fa-f]+|\d+)/;
+    const match = message.match(regex);
+    if (match) {
+        const instructionIndex = parseInt(match[1], 10);
+        let errorCode;
+        if (match[2].toLowerCase().startsWith("0x")) {
+            errorCode = parseInt(match[2], 16);
+        }
+        else {
+            errorCode = parseInt(match[2], 10);
+        }
+        return {
+            instructionIndex,
+            errorCode,
+        };
+    }
+    else {
+        return null;
+    }
+}
 function getErrorInfo(umi, tx, error, simulationSuccessful) {
     let canBeIgnored = false;
     let errorName = undefined;
@@ -449,7 +470,10 @@ function getErrorInfo(umi, tx, error, simulationSuccessful) {
             const err = error["InstructionError"];
             const computeIxs = simulationSuccessful ? 2 : 1; // sub ixs to account for computeUnitLimit and computeUnitPrice that get added
             const errIxIdx = err[0] - computeIxs;
-            (0, generalUtils_1.consoleLog)("Transaction instructions:", tx.getInstructions().map(x => x.programId.toString()).join(","));
+            (0, generalUtils_1.consoleLog)("Transaction instructions:", tx
+                .getInstructions()
+                .map((x) => x.programId.toString())
+                .join(","));
             (0, generalUtils_1.consoleLog)("Error instruction index:", errIxIdx);
             const errIx = tx.getInstructions()[Math.max(0, errIxIdx)];
             const errCode = typeof err[1] === "object" && "Custom" in err[1]

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;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;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAmCxB,6BAA6B;YAgG7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAqD9B"}
+{"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;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA4BxB,6BAA6B;YAuH7B,qBAAqB;YA2CrB,cAAc;YAqCd,eAAe;CA0D9B"}

package/dist/transactions/transactionsManager.js

@@ -171,15 +171,14 @@ class TransactionsManager {
                 let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
                     item,
                 ]);
-                for (let j = i; j >= 0; j--) {
-                    if (await newSet.fitsWith(items[j])) {
-                        newSet.prepend(items[j]);
-                        i--;
-                    }
-                    else {
-                        break;
-                    }
-                }
+                // for (let j = i; j >= 0; j--) {
+                //   if (await newSet.fitsWith(items[j])) {
+                //     newSet.prepend(items[j]);
+                //     i--;
+                //   } else {
+                //     break;
+                //   }
+                // }
                 transactionSets.unshift(newSet);
             }
         }
@@ -319,10 +318,6 @@ class TransactionsManager {
         const itemSets = await this.assembleTransactionSets(items);
         this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
         this.txHandler.log("Initial item sets:", itemSets.length);
-        if (this.txType === "only-simulate" && itemSets.length > 1) {
-            this.txHandler.log("Only simulate and more than 1 transaction. Skipping...");
-            return [];
-        }
         if (itemSets.length > 1 && this.atomically) {
             await this.processTransactionsAtomically(itemSets);
         }
@@ -337,6 +332,7 @@ class TransactionsManager {
     }
     async processTransactionsAtomically(itemSets) {
         let num = 0;
+        let transactions = [];
         await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => {
             num = attemptNum;
             if (attemptNum > 0) {
@@ -345,7 +341,7 @@ class TransactionsManager {
                 }
                 itemSets = await this.assembleTransactionSets(itemSets.flatMap((x) => x.items));
             }
-            let transactions = [];
+            transactions = [];
             for (const set of itemSets) {
                 transactions.push(await set.getSingleTransaction());
             }
@@ -358,19 +354,30 @@ class TransactionsManager {
             let txSigs;
             let error;
             try {
-                txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, transactions, this.txType, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
+                txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.signer, transactions, this.txType, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
             }
             catch (e) {
                 error = e;
             }
-            if (error || !Boolean(txSigs) || txSigs?.length === 0) {
+            if (error ||
+                (this.txType !== "only-simulate" &&
+                    (!Boolean(txSigs) || txSigs?.length === 0))) {
                 this.updateStatusForSets(itemSets, TransactionStatus.Failed, attemptNum, txSigs, undefined, error?.message);
                 throw error ? error : new 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, undefined, e.message);
-            throw e;
+            this.txHandler.log("Capturing error info...");
+            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, (0, umi_1.transactionBuilder)().add(transactions), e, itemSets.filter((x) => this.statuses.find((y) => x.name() === y.name)?.simulationSuccessful).length === itemSets.length);
+            const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
+            this.updateStatusForSets(itemSets, errorDetails.canBeIgnored
+                ? TransactionStatus.Skipped
+                : TransactionStatus.Failed, num, undefined, undefined, errorDetails.errorName || errorDetails.errorInfo
+                ? errorString
+                : e.message);
+            if (!errorDetails.canBeIgnored) {
+                throw e;
+            }
         });
     }
     async processTransactionSet(itemSets, currentIndex) {
@@ -391,12 +398,7 @@ class TransactionsManager {
                 await this.debugAccounts(itemSet, tx);
                 await this.sendTransaction(tx, itemSet.name(), attemptNum, this.getUpdatedPriorityFeeSetting(prevError, attemptNum));
             }
-        }, this.retries, this.retryDelay, this.errorsToThrow).catch((e) => {
-            if (itemSet) {
-                this.updateStatus(itemSet.name(), TransactionStatus.Failed, num, undefined, undefined, e.message);
-            }
-            throw e;
-        });
+        }, this.retries, this.retryDelay, this.errorsToThrow);
     }
     async refreshItemSet(itemSets, currentIndex, attemptNum) {
         const itemSet = itemSets[currentIndex];
@@ -423,8 +425,8 @@ class TransactionsManager {
             this.updateStatus(txName, TransactionStatus.Successful, attemptNum, txSig ? bs58_1.default.encode(txSig) : undefined);
         }
         catch (e) {
-            this.txHandler.log("Caputring error info...");
-            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, tx, e, this.statuses.find(x => x.name === txName)?.simulationSuccessful);
+            this.txHandler.log("Capturing error info...");
+            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, tx, e, this.statuses.find((x) => x.name === txName)?.simulationSuccessful);
             const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
             this.updateStatus(txName, errorDetails.canBeIgnored
                 ? TransactionStatus.Skipped

package/dist/utils/jitoUtils.d.ts

@@ -1,6 +1,6 @@
-import { Connection, PublicKey } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 export declare function getRandomTipAccount(): Promise<PublicKey>;
-export declare function sendJitoBundledTransactions(umi: Umi, connection: Connection, signer: Signer, txs: TransactionBuilder[], txType?: TransactionRunType, priorityFeeSetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<string[] | undefined>;
+export declare function sendJitoBundledTransactions(umi: Umi, signer: Signer, txs: TransactionBuilder[], txType?: TransactionRunType, priorityFeeSetting?: PriorityFeeSetting, onAwaitingSign?: () => void): 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,UAAU,EAAE,SAAS,EAAoE,MAAM,iBAAiB,CAAC;AAG1H,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;AAyHD,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+D/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAoKD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,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,CAwE/B"}

package/dist/utils/jitoUtils.js

@@ -13,7 +13,6 @@ 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",
@@ -31,28 +30,51 @@ async function getRandomTipAccount() {
 async function getTipInstruction(signer, tipLamports) {
     return (0, solanaUtils_1.systemTransferUmiIx)(signer, await getRandomTipAccount(), BigInt(tipLamports));
 }
-// TODO: fix
-// async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
-//   const simulationResult = await axios.post(
-//     `${JITO_BLOCK_ENGINE}/api/v1/bundles`,
-//     {
-//       method: "simulateBundle",
-//       id: 1,
-//       jsonrpc: "2.0",
-//       params: [
-//         {
-//           encodedTransactions: txs.map((x) => bs58.encode(x.serialize())),
-//           preExecutionAccountsConfigs: txs.map((_) => ""),
-//           postExecutionAccountsConfigs: txs.map((_) => ""),
-//           skipSigVerify: true,
-//         },
-//       ],
-//     }
-//   );
-// }
-async function umiToVersionedTransactions(umi, signer, txs, sign, feeEstimates, computeUnitLimits) {
+async function simulateJitoBundle(umi, txs) {
+    const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+        const resp = await axios_1.default.post(umi.rpc.getEndpoint(), {
+            jsonrpc: "2.0",
+            id: 1,
+            method: "simulateBundle",
+            params: [
+                {
+                    encodedTransactions: txs.map((x) => Buffer.from(x.serialize()).toString("base64")),
+                },
+                {
+                    encoding: "base64",
+                    commitment: "confirmed",
+                    preExecutionAccountsConfigs: txs.map((_) => { }),
+                    postExecutionAccountsConfigs: txs.map((_) => { }),
+                    skipSigVerify: true,
+                },
+            ],
+        }, {
+            headers: {
+                "Content-Type": "application/json",
+            },
+        });
+        const res = resp.data.result.value;
+        if (res && res.summary.failed) {
+            const transactionResults = res.transactionResults;
+            transactionResults.forEach((x) => {
+                x.logs?.forEach((y) => {
+                    (0, generalUtils_1.consoleLog)(y);
+                });
+            });
+            (0, generalUtils_1.consoleLog)(JSON.stringify(transactionResults, null, 2));
+            const txFailure = res.summary.failed.error.TransactionFailure;
+            throw new Error(txFailure ? txFailure[1] : res.summary.failed.toString());
+        }
+        return res;
+    });
+    const transactionResults = simulationResult.transactionResults;
+    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).setLatestBlockhash(umi)).build(umi);
+        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);
@@ -80,7 +102,12 @@ async function pollBundleStatus(bundleId, interval = 1000, timeout = 40000) {
             (0, generalUtils_1.consoleLog)("Statuses:", statuses);
             const status = statuses.value[0].confirmation_status;
             if (status === "confirmed") {
-                return statuses?.value[0].transactions;
+                return statuses.value[0].transactions;
+            }
+            const err = statuses.value[0].err;
+            if (err) {
+                (0, generalUtils_1.consoleLog)("Jito bundle err:", JSON.stringify(err, null, 2));
+                throw new Error(err);
             }
         }
     }
@@ -109,32 +136,30 @@ async function sendJitoBundle(transactions) {
     (0, generalUtils_1.consoleLog)("Bundle ID:", bundleId);
     return bundleId ? await pollBundleStatus(bundleId) : [];
 }
-async function sendJitoBundledTransactions(umi, connection, signer, txs, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, onAwaitingSign) {
-    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;
-    }
+async function sendJitoBundledTransactions(umi, signer, txs, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, onAwaitingSign) {
     (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)));
+    // consoleLog(txs.map((x) => x.getInstructions().map((x) => x.programId)));
     txs[0] = txs[0].prepend(await getTipInstruction(signer, 150000));
     const feeEstimates = priorityFeeSetting !== types_1.PriorityFeeSetting.None
         ? await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting)) ??
             1000000))
         : undefined;
-    let builtTxs = await umiToVersionedTransactions(umi, signer, txs, true, // false if simulating first and rebuilding later
-    feeEstimates);
-    // const simulationResults = await simulateJitoBundle(umi, builtTxs);
+    const latestBlockhash = (await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })).blockhash;
+    let builtTxs;
+    let simulationResults;
+    if (txType !== "skip-simulation") {
+        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") {
-        // let builtTxs = await umiToVersionedTransactions(
-        //   client.signer,
-        //   txs,
-        //   true,
-        //   feeEstimates,
-        //   simulationResults.map((x) => x.unitsConsumed! * 1.15)
-        // );
+        builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, signer, txs, true, feeEstimates, simulationResults
+            ? simulationResults.map((x) => x.unitsConsumed * 1.15)
+            : undefined);
         const serializedTxs = builtTxs.map((x) => x.serialize());
-        if (serializedTxs.find(x => x.length > 1232)) {
+        if (serializedTxs.find((x) => x.length > 1232)) {
             throw new Error("A transaction is too large");
         }
         onAwaitingSign?.();

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAazB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAiEA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,OAAO,EAAE,OAAO,UAejB;AAsDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAkLpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAazB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA4C3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAiEA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,OAAO,EAAE,OAAO,UAejB;AAsDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAwLpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}

package/dist/utils/marginfiUtils.js

@@ -229,9 +229,13 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
     if (!supplyUsage) {
         supplyUsage = await getTokenUsage(supplyBank, true, 0, livePositionUpdates?.supplyAdjustment);
     }
-    if (debtBank === null ||
-        (!constants_1.TOKEN_INFO[supplyBank.mint.toString()].isStableCoin &&
-            !constants_1.TOKEN_INFO[debtBank.mint.toString()].isStableCoin)) {
+    if (debtBank === null) {
+        return undefined;
+    }
+    const supplyMint = constants_1.TOKEN_INFO[supplyBank.mint.toString()];
+    const debtMint = constants_1.TOKEN_INFO[debtBank.mint.toString()];
+    if ((!supplyMint.isStableCoin && !debtMint.isStableCoin) ||
+        (supplyMint.isStableCoin && debtMint.isStableCoin)) {
         return undefined;
     }
     if (!debtUsage) {

package/dist/utils/solanaUtils.js

@@ -179,7 +179,7 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting) {
             feeEstimate = Math.round(resp.priorityFeeEstimate);
         }
         catch (e) {
-            console.error(e);
+            // console.error(e);
         }
     }
     return feeEstimate;
@@ -230,7 +230,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
     const blockhash = await connection.getLatestBlockhash("confirmed");
     let computeUnitLimit = undefined;
     if (txType !== "skip-simulation") {
-        const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(umi, connection, await assembleFinalTransaction(umi.identity, tx, undefined, 1400000).setBlockhash(blockhash)), 3);
+        const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(umi, connection, assembleFinalTransaction(umi.identity, tx, undefined, 1400000).setBlockhash(blockhash)), 3);
         simulationResult.value.err;
         computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.15);
         (0, generalUtils_1.consoleLog)("Compute unit limit: ", computeUnitLimit);

package/local/logPositions.ts

@@ -0,0 +1,21 @@
+import {
+  buildHeliusApiUrl,
+  getSolanaRpcConnection,
+  getSolautoManagedPositions,
+  SOLAUTO_PROD_PROGRAM,
+} from "../src";
+
+async function main() {
+  const [_, umi] = getSolanaRpcConnection(
+    buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
+    SOLAUTO_PROD_PROGRAM
+  );
+  const positions = await getSolautoManagedPositions(umi);
+  // TODO: filter out certain wallet authorities using an env variable
+
+  console.log(positions);
+  console.log("Total positions:", positions.length);
+  // TODO: log net worth / balances
+}
+
+main().then((x) => x);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.372",
+  "version": "1.0.374",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -10,11 +10,7 @@
     "build": "rm -rf dist && npx tsc",
     "test:txs": "ts-mocha -p ./tsconfig.json -t 1000000 tests/transactions/**/*.ts",
     "test:unit": "ts-mocha -p ./tsconfig.json -t 1000000 tests/unit/**/*.ts",
-    "test:all": "pnpm test:unit && pnpm test:txs",
-    "update-lut:solauto": "npx ts-node local/updateSolautoLUT.ts",
-    "update-lut:marginfi": "npx ts-node local/updateMarginfiLUT.ts",
-    "create-ism-accounts": "npx ts-node local/createISMAccounts.ts",
-    "create-token-accounts": "npx ts-node local/createTokenAccounts.ts"
+    "test:all": "pnpm test:unit && pnpm test:txs"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",

package/src/transactions/transactionUtils.ts

@@ -637,7 +637,10 @@ export async function requiresRefreshBeforeRebalance(client: SolautoClient) {
       client.livePositionUpdates.debtAdjustment === BigInt(0) &&
       utilizationRateDiff >= 10
     ) {
-      client.log("Choosing to refresh before rebalance. Utilization rate diff:", utilizationRateDiff);
+      client.log(
+        "Choosing to refresh before rebalance. Utilization rate diff:",
+        utilizationRateDiff
+      );
       return true;
     }
   }
@@ -821,7 +824,36 @@ export async function convertReferralFeesToDestination(
   return { tx, lookupTableAddresses };
 }
 
-export function getErrorInfo(umi: Umi, tx: TransactionBuilder, error: any, simulationSuccessful?: boolean) {
+function parseJitoErrorMessage(message: string) {
+  const regex =
+    /Error processing Instruction (\d+): custom program error: (0x[0-9A-Fa-f]+|\d+)/;
+  const match = message.match(regex);
+
+  if (match) {
+    const instructionIndex = parseInt(match[1], 10);
+
+    let errorCode: number;
+    if (match[2].toLowerCase().startsWith("0x")) {
+      errorCode = parseInt(match[2], 16);
+    } else {
+      errorCode = parseInt(match[2], 10);
+    }
+
+    return {
+      instructionIndex,
+      errorCode,
+    };
+  } else {
+    return null;
+  }
+}
+
+export function getErrorInfo(
+  umi: Umi,
+  tx: TransactionBuilder,
+  error: any,
+  simulationSuccessful?: boolean
+) {
   let canBeIgnored = false;
   let errorName: string | undefined = undefined;
   let errorInfo: string | undefined = undefined;
@@ -835,7 +867,13 @@ export function getErrorInfo(umi: Umi, tx: TransactionBuilder, error: any, simul
       const computeIxs = simulationSuccessful ? 2 : 1; // sub ixs to account for computeUnitLimit and computeUnitPrice that get added
       const errIxIdx = err[0] - computeIxs;
 
-      consoleLog("Transaction instructions:", tx.getInstructions().map(x => x.programId.toString()).join(","));
+      consoleLog(
+        "Transaction instructions:",
+        tx
+          .getInstructions()
+          .map((x) => x.programId.toString())
+          .join(",")
+      );
       consoleLog("Error instruction index:", errIxIdx);
 
       const errIx = tx.getInstructions()[Math.max(0, errIxIdx)];

package/src/transactions/transactionsManager.ts

@@ -263,14 +263,14 @@ export class TransactionsManager {
         let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
           item,
         ]);
-        for (let j = i; j >= 0; j--) {
-          if (await newSet.fitsWith(items[j])) {
-            newSet.prepend(items[j]);
-            i--;
-          } else {
-            break;
-          }
-        }
+        // for (let j = i; j >= 0; j--) {
+        //   if (await newSet.fitsWith(items[j])) {
+        //     newSet.prepend(items[j]);
+        //     i--;
+        //   } else {
+        //     break;
+        //   }
+        // }
         transactionSets.unshift(newSet);
       }
     }
@@ -510,13 +510,6 @@ export class TransactionsManager {
     this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
     this.txHandler.log("Initial item sets:", itemSets.length);
 
-    if (this.txType === "only-simulate" && itemSets.length > 1) {
-      this.txHandler.log(
-        "Only simulate and more than 1 transaction. Skipping..."
-      );
-      return [];
-    }
-
     if (itemSets.length > 1 && this.atomically) {
       await this.processTransactionsAtomically(itemSets);
     } else {
@@ -532,6 +525,7 @@ export class TransactionsManager {
 
   private async processTransactionsAtomically(itemSets: TransactionSet[]) {
     let num = 0;
+    let transactions: TransactionBuilder[] = [];
 
     await retryWithExponentialBackoff(
       async (attemptNum, prevError) => {
@@ -546,7 +540,7 @@ export class TransactionsManager {
           );
         }
 
-        let transactions = [];
+        transactions = [];
         for (const set of itemSets) {
           transactions.push(await set.getSingleTransaction());
         }
@@ -573,7 +567,6 @@ export class TransactionsManager {
         try {
           txSigs = await sendJitoBundledTransactions(
             this.txHandler.umi,
-            this.txHandler.connection,
             this.txHandler.signer,
             transactions,
             this.txType,
@@ -591,7 +584,11 @@ export class TransactionsManager {
           error = e as Error;
         }
 
-        if (error || !Boolean(txSigs) || txSigs?.length === 0) {
+        if (
+          error ||
+          (this.txType !== "only-simulate" &&
+            (!Boolean(txSigs) || txSigs?.length === 0))
+        ) {
           this.updateStatusForSets(
             itemSets,
             TransactionStatus.Failed,
@@ -614,15 +611,34 @@ export class TransactionsManager {
       this.retryDelay,
       this.errorsToThrow
     ).catch((e: Error) => {
+      this.txHandler.log("Capturing error info...");
+      const errorDetails = getErrorInfo(
+        this.txHandler.umi,
+        transactionBuilder().add(transactions),
+        e,
+        itemSets.filter(
+          (x) =>
+            this.statuses.find((y) => x.name() === y.name)?.simulationSuccessful
+        ).length === itemSets.length
+      );
+
+      const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
       this.updateStatusForSets(
         itemSets,
-        TransactionStatus.Failed,
+        errorDetails.canBeIgnored
+          ? TransactionStatus.Skipped
+          : TransactionStatus.Failed,
         num,
         undefined,
         undefined,
-        e.message
+        errorDetails.errorName || errorDetails.errorInfo
+          ? errorString
+          : e.message
       );
-      throw e;
+
+      if (!errorDetails.canBeIgnored) {
+        throw e;
+      }
     });
   }
 
@@ -666,19 +682,7 @@ export class TransactionsManager {
       this.retries,
       this.retryDelay,
       this.errorsToThrow
-    ).catch((e: Error) => {
-      if (itemSet) {
-        this.updateStatus(
-          itemSet.name(),
-          TransactionStatus.Failed,
-          num,
-          undefined,
-          undefined,
-          e.message
-        );
-      }
-      throw e;
-    });
+    );
   }
 
   private async refreshItemSet(
@@ -749,8 +753,13 @@ export class TransactionsManager {
         txSig ? bs58.encode(txSig) : undefined
       );
     } catch (e: any) {
-      this.txHandler.log("Caputring error info...");
-      const errorDetails = getErrorInfo(this.txHandler.umi, tx, e, this.statuses.find(x => x.name === txName)?.simulationSuccessful);
+      this.txHandler.log("Capturing error info...");
+      const errorDetails = getErrorInfo(
+        this.txHandler.umi,
+        tx,
+        e,
+        this.statuses.find((x) => x.name === txName)?.simulationSuccessful
+      );
 
       const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
       this.updateStatus(

package/src/utils/jitoUtils.ts

@@ -1,4 +1,9 @@
-import { Connection, PublicKey, TransactionExpiredBlockheightExceededError, VersionedTransaction } from "@solana/web3.js";
+import {
+  PublicKey,
+  SimulatedTransactionResponse,
+  TransactionExpiredBlockheightExceededError,
+  VersionedTransaction,
+} from "@solana/web3.js";
 import { toWeb3JsTransaction } from "@metaplex-foundation/umi-web3js-adapters";
 import { JITO_BLOCK_ENGINE } from "../constants/solautoConstants";
 import {
@@ -9,16 +14,13 @@ import {
 } from "@metaplex-foundation/umi";
 import {
   assembleFinalTransaction,
-  buildIronforgeApiUrl,
   getComputeUnitPriceEstimate,
-  sendSingleOptimizedTransaction,
   systemTransferUmiIx,
 } from "./solanaUtils";
-import { consoleLog } from "./generalUtils";
+import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 import axios from "axios";
 import base58 from "bs58";
-import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
 
 export async function getRandomTipAccount(): Promise<PublicKey> {
   const tipAccounts = [
@@ -46,28 +48,64 @@ async function getTipInstruction(
   );
 }
 
-// TODO: fix
-// async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
-//   const simulationResult = await axios.post(
-//     `${JITO_BLOCK_ENGINE}/api/v1/bundles`,
-//     {
-//       method: "simulateBundle",
-//       id: 1,
-//       jsonrpc: "2.0",
-//       params: [
-//         {
-//           encodedTransactions: txs.map((x) => bs58.encode(x.serialize())),
-//           preExecutionAccountsConfigs: txs.map((_) => ""),
-//           postExecutionAccountsConfigs: txs.map((_) => ""),
-//           skipSigVerify: true,
-//         },
-//       ],
-//     }
-//   );
-// }
+async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
+  const simulationResult = await retryWithExponentialBackoff(async () => {
+    const resp = await axios.post(
+      umi.rpc.getEndpoint(),
+      {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "simulateBundle",
+        params: [
+          {
+            encodedTransactions: txs.map((x) =>
+              Buffer.from(x.serialize()).toString("base64")
+            ),
+          },
+          {
+            encoding: "base64",
+            commitment: "confirmed",
+            preExecutionAccountsConfigs: txs.map((_) => {}),
+            postExecutionAccountsConfigs: txs.map((_) => {}),
+            skipSigVerify: true,
+          },
+        ],
+      },
+      {
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }
+    );
+
+    const res = resp.data.result.value as any;
+
+    if (res && res.summary.failed) {
+      const transactionResults =
+        res.transactionResults as SimulatedTransactionResponse[];
+      transactionResults.forEach((x) => {
+        x.logs?.forEach((y) => {
+          consoleLog(y);
+        });
+      });
+
+      consoleLog(JSON.stringify(transactionResults, null, 2));
+      const txFailure = res.summary.failed.error.TransactionFailure;
+      throw new Error(txFailure ? txFailure[1] : res.summary.failed.toString());
+    }
+
+    return res;
+  });
+
+  const transactionResults =
+    simulationResult.transactionResults as SimulatedTransactionResponse[];
+
+  return transactionResults;
+}
 
 async function umiToVersionedTransactions(
   umi: Umi,
+  blockhash: string,
   signer: Signer,
   txs: TransactionBuilder[],
   sign: boolean,
@@ -76,14 +114,14 @@ async function umiToVersionedTransactions(
 ): Promise<VersionedTransaction[]> {
   let builtTxs = await Promise.all(
     txs.map(async (tx, i) => {
-      return (
-        await assembleFinalTransaction(
-          signer,
-          tx,
-          feeEstimates ? feeEstimates[i] : undefined,
-          computeUnitLimits ? computeUnitLimits[i] : undefined
-        ).setLatestBlockhash(umi)
-      ).build(umi);
+      return assembleFinalTransaction(
+        signer,
+        tx,
+        feeEstimates ? feeEstimates[i] : undefined,
+        computeUnitLimits ? computeUnitLimits[i] : undefined
+      )
+        .setBlockhash(blockhash)
+        .build(umi);
     })
   );
 
@@ -121,11 +159,18 @@ async function pollBundleStatus(
       consoleLog("Statuses:", statuses);
       const status = statuses.value[0].confirmation_status;
       if (status === "confirmed") {
-        return statuses?.value[0].transactions as string[];
+        return statuses.value[0].transactions as string[];
+      }
+      const err = statuses.value[0].err;
+      if (err) {
+        consoleLog("Jito bundle err:", JSON.stringify(err, null, 2));
+        throw new Error(err);
       }
     }
   }
-  throw new TransactionExpiredBlockheightExceededError("Unable to confirm transaction. Try a higher priority fee.");
+  throw new TransactionExpiredBlockheightExceededError(
+    "Unable to confirm transaction. Try a higher priority fee."
+  );
 }
 
 async function sendJitoBundle(transactions: string[]): Promise<string[]> {
@@ -156,30 +201,19 @@ async function sendJitoBundle(transactions: string[]): Promise<string[]> {
 
 export async function sendJitoBundledTransactions(
   umi: Umi,
-  connection: Connection,
   signer: Signer,
   txs: TransactionBuilder[],
   txType?: TransactionRunType,
   priorityFeeSetting: PriorityFeeSetting = PriorityFeeSetting.Min,
   onAwaitingSign?: () => void
 ): 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(
     "Transaction sizes: ",
     txs.map((x) => x.getTransactionSize(umi))
   );
+  // consoleLog(txs.map((x) => x.getInstructions().map((x) => x.programId)));
 
   txs[0] = txs[0].prepend(await getTipInstruction(signer, 150_000));
   const feeEstimates =
@@ -193,27 +227,46 @@ export async function sendJitoBundledTransactions(
         )
       : undefined;
 
-  let builtTxs = await umiToVersionedTransactions(
-    umi,
-    signer,
-    txs,
-    true, // false if simulating first and rebuilding later
-    feeEstimates
-  );
+  const latestBlockhash = (
+    await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })
+  ).blockhash;
 
-  // const simulationResults = await simulateJitoBundle(umi, builtTxs);
+  let builtTxs: VersionedTransaction[];
+  let simulationResults: SimulatedTransactionResponse[] | undefined;
+  if (txType !== "skip-simulation") {
+    builtTxs = await umiToVersionedTransactions(
+      umi,
+      latestBlockhash,
+      signer,
+      txs,
+      false,
+      feeEstimates
+    );
+    consoleLog(
+      builtTxs.map((x) =>
+        x.message.compiledInstructions.map((y) =>
+          x.message.staticAccountKeys[y.programIdIndex].toString()
+        )
+      )
+    );
+    simulationResults = await simulateJitoBundle(umi, builtTxs);
+  }
 
   if (txType !== "only-simulate") {
-    // let builtTxs = await umiToVersionedTransactions(
-    //   client.signer,
-    //   txs,
-    //   true,
-    //   feeEstimates,
-    //   simulationResults.map((x) => x.unitsConsumed! * 1.15)
-    // );
+    builtTxs = await umiToVersionedTransactions(
+      umi,
+      latestBlockhash,
+      signer,
+      txs,
+      true,
+      feeEstimates,
+      simulationResults
+        ? simulationResults.map((x) => x.unitsConsumed! * 1.15)
+        : undefined
+    );
 
     const serializedTxs = builtTxs.map((x) => x.serialize());
-    if (serializedTxs.find(x => x.length > 1232)) {
+    if (serializedTxs.find((x) => x.length > 1232)) {
       throw new Error("A transaction is too large");
     }
 

package/src/utils/marginfiUtils.ts

@@ -134,7 +134,11 @@ export async function getMarginfiMaxLtvAndLiqThreshold(
     return [0, 0];
   }
 
-  return calcMarginfiMaxLtvAndLiqThreshold(supply.bank!, debt.bank, supplyPrice);
+  return calcMarginfiMaxLtvAndLiqThreshold(
+    supply.bank!,
+    debt.bank,
+    supplyPrice
+  );
 }
 
 export async function getAllMarginfiAccountsByAuthority(
@@ -412,10 +416,16 @@ export async function getMarginfiAccountPositionState(
     );
   }
 
+  if (debtBank === null) {
+    return undefined;
+  }
+
+  const supplyMint = TOKEN_INFO[supplyBank.mint.toString()];
+  const debtMint = TOKEN_INFO[debtBank.mint.toString()];
+
   if (
-    debtBank === null ||
-    (!TOKEN_INFO[supplyBank.mint.toString()].isStableCoin &&
-      !TOKEN_INFO[debtBank.mint.toString()].isStableCoin)
+    (!supplyMint.isStableCoin && !debtMint.isStableCoin) ||
+    (supplyMint.isStableCoin && debtMint.isStableCoin)
   ) {
     return undefined;
   }

package/src/utils/solanaUtils.ts

@@ -319,7 +319,7 @@ export async function getComputeUnitPriceEstimate(
       ]);
       feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
     } catch (e) {
-      console.error(e);
+      // console.error(e);
     }
   }
 
@@ -402,7 +402,7 @@ export async function sendSingleOptimizedTransaction(
         await simulateTransaction(
           umi,
           connection,
-          await assembleFinalTransaction(
+          assembleFinalTransaction(
             umi.identity,
             tx,
             undefined,

package/tests/transactions/solautoMarginfi.ts

@@ -1,12 +1,9 @@
 import { describe, it } from "mocha";
-import {
-  none,
-  publicKey,
-  some,
-} from "@metaplex-foundation/umi";
+import { none, publicKey, some, transactionBuilder } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
+  PositionType,
   safeFetchSolautoPosition,
   solautoAction,
   SolautoSettingsParametersInpArgs,
@@ -29,23 +26,21 @@ import {
   SOLAUTO_TEST_PROGRAM,
   USDC,
 } from "../../src/constants";
-import {
-  buildHeliusApiUrl,
-  getSolautoManagedPositions,
-} from "../../src/utils";
+import { buildHeliusApiUrl, getAllPositionsByAuthority, getSolautoManagedPositions } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
+import { buildIronforgeApiUrl, TransactionManagerStatuses } from "../../dist";
 
 describe("Solauto Marginfi tests", async () => {
-  // const signer = setupTest();
-  const signer = setupTest("solauto-manager");
+  const signer = setupTest();
+  // const signer = setupTest("solauto-manager");
 
   const payForTransactions = false;
-  const testProgram = false;
+  const testProgram = true;
   const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
-      buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
+      buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
       true,
       testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
     );
@@ -57,7 +52,7 @@ describe("Solauto Marginfi tests", async () => {
     // await client.initialize({
     //   signer,
     //   positionId,
-    //   authority: new PublicKey("5FALSVLRjuRZHSmQVdT2RUZC6KadCuDmxY7gaQFWFBxf"),
+    //   authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
     //   // new: true,
     //   // marginfiAccount: new PublicKey(
     //   //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
@@ -67,7 +62,7 @@ describe("Solauto Marginfi tests", async () => {
     //   // debtMint: new PublicKey(USDC),
     // });
 
-    console.log(await getSolautoManagedPositions(client.umi));
+    console.log(await getSolautoManagedPositions(client.umi, new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"), PositionType.Leverage));
 
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {
@@ -100,7 +95,17 @@ describe("Solauto Marginfi tests", async () => {
     //     // const [supplyPrice] = await fetchTokenPrices([supply]);
     //     return {
     //       tx: client.protocolInteraction(
-    //         solautoAction("Deposit", [toBaseUnit(300, supplyDecimals)])
+    //         solautoAction("Deposit", [toBaseUnit(0.05, supplyDecimals)])
+    //       ),
+    //     };
+    //   }, "deposit")
+    // );
+    // transactionItems.push(
+    //   new TransactionItem(async () => {
+    //     // const [supplyPrice] = await fetchTokenPrices([supply]);
+    //     return {
+    //       tx: client.protocolInteraction(
+    //         solautoAction("Deposit", [toBaseUnit(0.05, supplyDecimals)])
     //       ),
     //     };
     //   }, "deposit")
@@ -127,13 +132,13 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    transactionItems.push(
-      new TransactionItem(
-        async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
-        "rebalance"
-      )
-    );
+    // transactionItems.push(
+    //   new TransactionItem(
+    //     async (attemptNum) =>
+    //       await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+    //     "rebalance"
+    //   )
+    // );
 
     // transactionItems.push(
     //   new TransactionItem(
@@ -147,12 +152,61 @@ describe("Solauto Marginfi tests", async () => {
     //   new TransactionItem(
     //     async () => ({
     //       tx: client.protocolInteraction(
-    //         solautoAction("Withdraw", [{ __kind: "All" }])
+    //         solautoAction("Withdraw", [{ __kind: "Some", fields: [toBaseUnit(0.03, 9)] }])
     //       ),
     //     }),
     //     "withdraw"
     //   )
     // );
+    // transactionItems.push(
+    //   new TransactionItem(
+    //     async () => ({
+    //       tx: client.protocolInteraction(
+    //         solautoAction("Withdraw", [{ __kind: "Some", fields: [toBaseUnit(0.03, 9)] }])
+    //       ),
+    //     }),
+    //     "withdraw"
+    //   )
+    // );
+
+    transactionItems.push(
+      new TransactionItem(
+        async () => ({
+          tx: transactionBuilder()
+            .add(
+              client.protocolInteraction(
+                solautoAction("Withdraw", [
+                  { __kind: "Some", fields: [toBaseUnit(0.01, 9)] },
+                ])
+              )
+            )
+        }),
+        "withdraw"
+      )
+    );
+
+    transactionItems.push(
+      new TransactionItem(
+        async () => ({
+          tx: transactionBuilder()
+            .add(
+              client.protocolInteraction(
+                solautoAction("Withdraw", [
+                  { __kind: "Some", fields: [toBaseUnit(0.01, 9)] },
+                ])
+              )
+            )
+            .add(
+              client.protocolInteraction(
+                solautoAction("Withdraw", [
+                  { __kind: "Some", fields: [toBaseUnit(300, 9)] },
+                ])
+              )
+            )
+        }),
+        "withdraw"
+      )
+    );
 
     // transactionItems.push(
     //   new TransactionItem(
@@ -163,8 +217,12 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
+    // const temp = (statuses: TransactionManagerStatuses) =>
+    //   console.log(statuses);
+
     // const statuses = await new TransactionsManager(
     //   client,
+    //   // temp,
     //   undefined,
     //   !payForTransactions ? "only-simulate" : "normal",
     //   PriorityFeeSetting.Low,