@haven-fi/solauto-sdk 1.0.238 → 1.0.240

package/dist/transactions/transactionsManager.d.ts

@@ -35,18 +35,22 @@ export declare class TransactionsManager {
     private txHandler;
     private statusCallback?;
     private txType?;
-    private mustBeAtomic?;
+    private priorityFeeSetting;
     private errorsToThrow?;
     private retries;
     private retryDelay;
     private statuses;
     private lookupTables;
-    constructor(txHandler: SolautoClient | ReferralStateManager, statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, txType?: TransactionRunType | undefined, mustBeAtomic?: boolean | undefined, errorsToThrow?: ErrorsToThrow | undefined, retries?: number, retryDelay?: number);
+    constructor(txHandler: SolautoClient | ReferralStateManager, statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, txType?: TransactionRunType | undefined, priorityFeeSetting?: PriorityFeeSetting, errorsToThrow?: ErrorsToThrow | undefined, retries?: number, retryDelay?: number);
     private assembleTransactionSets;
     private updateStatus;
     private debugAccounts;
-    clientSend(transactions: TransactionItem[], prioritySetting?: PriorityFeeSetting): Promise<TransactionManagerStatuses>;
-    send(items: TransactionItem[], prioritySetting?: PriorityFeeSetting, initialized?: boolean): Promise<TransactionManagerStatuses>;
+    private getUpdatedPriorityFeeSetting;
+    private updateStatusForSets;
+    clientSend(transactions: TransactionItem[]): Promise<TransactionManagerStatuses>;
+    send(items: TransactionItem[], initialized?: boolean): Promise<TransactionManagerStatuses>;
+    private processTransactionSet;
+    private refreshItemSet;
     private sendTransaction;
 }
 //# sourceMappingURL=transactionsManager.d.ts.map

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;AAKzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAG7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IAPtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAgFD,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,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAVpB,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,YAAY,CAAC,EAAE,OAAO,YAAA,EACtB,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA8CN,aAAa;IAoBd,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,EAC/B,eAAe,CAAC,EAAE,kBAAkB,GACnC,OAAO,CAAC,0BAA0B,CAAC;IAyEzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,EACxB,eAAe,CAAC,EAAE,kBAAkB,EACpC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,0BAA0B,CAAC;YAwGxB,eAAe;CAkD9B"}
+{"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;AAKzD,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;AAI7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IAPtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAgFD,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,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAVpB,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,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA8CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAUpC,OAAO,CAAC,mBAAmB;IAMd,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IAyEzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,EACxB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,0BAA0B,CAAC;YA6BxB,qBAAqB;YAiDrB,cAAc;YAqBd,eAAe;CAkD9B"}

package/dist/transactions/transactionsManager.js

@@ -9,11 +9,13 @@ const umi_1 = require("@metaplex-foundation/umi");
 const solanaUtils_1 = require("../utils/solanaUtils");
 const generalUtils_1 = require("../utils/generalUtils");
 const transactionUtils_1 = require("./transactionUtils");
+const types_1 = require("../types");
+const web3_js_1 = require("@solana/web3.js");
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 class TransactionTooLargeError extends Error {
     constructor(message) {
         super(message);
-        this.name = 'TransactionTooLargeError';
+        this.name = "TransactionTooLargeError";
         Object.setPrototypeOf(this, TransactionTooLargeError.prototype);
     }
 }
@@ -127,11 +129,11 @@ var TransactionStatus;
     TransactionStatus["Failed"] = "Failed";
 })(TransactionStatus || (exports.TransactionStatus = TransactionStatus = {}));
 class TransactionsManager {
-    constructor(txHandler, statusCallback, txType, mustBeAtomic, errorsToThrow, retries = 4, retryDelay = 150) {
+    constructor(txHandler, statusCallback, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, errorsToThrow, retries = 4, retryDelay = 150) {
         this.txHandler = txHandler;
         this.statusCallback = statusCallback;
         this.txType = txType;
-        this.mustBeAtomic = mustBeAtomic;
+        this.priorityFeeSetting = priorityFeeSetting;
         this.errorsToThrow = errorsToThrow;
         this.retries = retries;
         this.retryDelay = retryDelay;
@@ -222,7 +224,19 @@ class TransactionsManager {
             }
         }
     }
-    async clientSend(transactions, prioritySetting) {
+    getUpdatedPriorityFeeSetting(prevError) {
+        if (prevError instanceof web3_js_1.TransactionExpiredBlockheightExceededError) {
+            const currIdx = types_1.priorityFeeSettingValues.indexOf(this.priorityFeeSetting);
+            return types_1.priorityFeeSettingValues[Math.min(types_1.priorityFeeSettingValues.length - 1, currIdx + 1)];
+        }
+        return this.priorityFeeSetting;
+    }
+    updateStatusForSets(itemSets) {
+        itemSets.forEach((itemSet) => {
+            this.updateStatus(itemSet.name(), TransactionStatus.Queued, 0);
+        });
+    }
+    async clientSend(transactions) {
         const items = [...transactions];
         const client = this.txHandler;
         const updateLookupTable = await client.updateLookupTable();
@@ -230,7 +244,7 @@ class TransactionsManager {
         if (updateLookupTable &&
             updateLookupTable.updateLutTx.getInstructions().length > 0 &&
             updateLookupTable?.needsToBeIsolated) {
-            await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => await this.sendTransaction(updateLookupTable.updateLutTx, updateLutTxName, attemptNum, prioritySetting), 3, 150, this.errorsToThrow);
+            await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => await this.sendTransaction(updateLookupTable.updateLutTx, updateLutTxName, attemptNum, this.getUpdatedPriorityFeeSetting(prevError)), 3, 150, this.errorsToThrow);
         }
         this.lookupTables.defaultLuts = client.defaultLookupTables();
         for (const item of items) {
@@ -254,7 +268,7 @@ class TransactionsManager {
             items.push(chore);
             this.txHandler.log("Chores after: ", choresAfter.getInstructions().length);
         }
-        const result = await this.send(items, prioritySetting, true).catch((e) => {
+        const result = await this.send(items, true).catch((e) => {
             client.resetLiveTxUpdates(false);
             throw e;
         });
@@ -263,7 +277,7 @@ class TransactionsManager {
         }
         return result;
     }
-    async send(items, prioritySetting, initialized) {
+    async send(items, initialized) {
         this.statuses = [];
         this.lookupTables.reset();
         if (!initialized) {
@@ -272,73 +286,58 @@ class TransactionsManager {
             }
         }
         const itemSets = await this.assembleTransactionSets(items);
-        const statusesStartIdx = this.statuses.length;
-        for (const itemSet of itemSets) {
-            this.updateStatus(itemSet.name(), TransactionStatus.Queued, 0);
+        this.updateStatusForSets(itemSets);
+        if (this.txType === "only-simulate" && itemSets.length > 1) {
+            this.txHandler.log("Only simulate and more than 1 transaction. Skipping...");
+            return [];
         }
-        if (this.mustBeAtomic && itemSets.length > 1) {
-            throw new Error(`${itemSets.length} transactions required but jito bundles are not currently supported`);
-            // itemSets.forEach((set) => {
-            //   this.updateStatus(set.name(), TransactionStatus.Processing);
-            // });
-            // await sendJitoBundledTransactions(
-            //   this.client,
-            //   await Promise.all(itemSets.map((x) => x.getSingleTransaction())),
-            //   this.simulateOnly
-            // );
-            // TODO: check if successful or not
-            // itemSets.forEach((set) => {
-            //   this.updateStatus(set.name(), TransactionStatus.Successful);
-            // });
+        let currentIndex = 0;
+        while (currentIndex < itemSets.length) {
+            await this.processTransactionSet(itemSets, currentIndex);
+            currentIndex++;
         }
-        else if (this.txType !== "only-simulate" || itemSets.length === 1) {
-            for (let i = 0; i < itemSets.length; i++) {
-                const getFreshItemSet = async (itemSet, attemptNum) => {
-                    await itemSet.refetchAll(attemptNum);
-                    const newItemSets = await this.assembleTransactionSets([
-                        ...itemSet.items,
-                        ...itemSets
-                            .slice(i + 1)
-                            .map((x) => x.items)
-                            .flat(),
-                    ]);
-                    if (newItemSets.length > 1) {
-                        this.statuses.splice(statusesStartIdx + i, itemSets.length - i, ...newItemSets.map((x) => ({
-                            name: x.name(),
-                            status: TransactionStatus.Queued,
-                            attemptNum: 0,
-                        })));
-                        this.txHandler.log(this.statuses);
-                        itemSets.splice(i + 1, itemSets.length - i - 1, ...newItemSets.slice(1));
-                    }
-                    return newItemSets.length > 0 ? newItemSets[0] : undefined;
-                };
-                let itemSet = itemSets[i];
-                await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => {
-                    itemSet =
-                        i > 0 || attemptNum > 0
-                            ? await getFreshItemSet(itemSet, attemptNum)
-                            : itemSet;
-                    if (!itemSet) {
-                        return;
-                    }
-                    const tx = await itemSet.getSingleTransaction();
-                    if (tx.getInstructions().length === 0) {
-                        this.updateStatus(itemSet.name(), TransactionStatus.Skipped, attemptNum);
-                    }
-                    else {
-                        await this.debugAccounts(itemSet, tx);
-                        await this.sendTransaction(tx, itemSet.name(), attemptNum, prioritySetting);
-                    }
-                }, this.retries, this.retryDelay, this.errorsToThrow);
+        return this.statuses;
+    }
+    async processTransactionSet(itemSets, currentIndex) {
+        let itemSet = itemSets[currentIndex];
+        await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => {
+            if (currentIndex > 0 || attemptNum > 0) {
+                itemSet = await this.refreshItemSet(itemSets, currentIndex, attemptNum);
+            }
+            if (!itemSet)
+                return;
+            const tx = await itemSet.getSingleTransaction();
+            if (tx.getInstructions().length === 0) {
+                this.updateStatus(itemSet.name(), TransactionStatus.Skipped, attemptNum);
+            }
+            else {
+                await this.debugAccounts(itemSet, tx);
+                await this.sendTransaction(tx, itemSet.name(), attemptNum, this.getUpdatedPriorityFeeSetting(prevError));
             }
+        }, this.retries, this.retryDelay, this.errorsToThrow).catch((e) => {
+            if (itemSet) {
+                this.updateStatus(itemSet.name(), TransactionStatus.Failed, this.retries);
+            }
+            throw e;
+        });
+    }
+    async refreshItemSet(itemSets, currentIndex, attemptNum) {
+        const itemSet = itemSets[currentIndex];
+        await itemSet.refetchAll(attemptNum);
+        const newItemSets = await this.assembleTransactionSets([
+            ...itemSet.items,
+            ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
+        ]);
+        if (newItemSets.length > 1) {
+            itemSets.splice(currentIndex + 1, itemSets.length - currentIndex - 1, ...newItemSets.slice(1));
+            this.updateStatusForSets(newItemSets.slice(1));
         }
-        return this.statuses;
+        return newItemSets[0];
     }
-    async sendTransaction(tx, txName, attemptNum, prioritySetting) {
+    async sendTransaction(tx, txName, attemptNum, priorityFeeSetting) {
         this.updateStatus(txName, TransactionStatus.Processing, attemptNum);
         try {
-            const txSig = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, this.txType, prioritySetting, () => this.updateStatus(txName, TransactionStatus.Processing, attemptNum, undefined, true));
+            const txSig = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, this.txType, priorityFeeSetting, () => this.updateStatus(txName, TransactionStatus.Processing, attemptNum, undefined, true));
             this.updateStatus(txName, TransactionStatus.Successful, attemptNum, txSig ? bs58_1.default.encode(txSig) : undefined);
         }
         catch (e) {

package/dist/types/solauto.d.ts

@@ -18,6 +18,7 @@ export declare enum PriorityFeeSetting {
     Default = "Medium",
     High = "High"
 }
+export declare const priorityFeeSettingValues: PriorityFeeSetting[];
 export type RebalanceAction = "boost" | "repay" | "dca";
 export type TransactionRunType = "skip-simulation" | "only-simulate" | "normal";
 export interface TransactionItemInputs {

package/dist/types/solauto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC"}
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;CACd;AAED,eAAO,MAAM,wBAAwB,EAAwC,kBAAkB,EAAE,CAAC;AAElG,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC"}

package/dist/types/solauto.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PriorityFeeSetting = void 0;
+exports.priorityFeeSettingValues = exports.PriorityFeeSetting = void 0;
 var PriorityFeeSetting;
 (function (PriorityFeeSetting) {
     PriorityFeeSetting["None"] = "None";
@@ -9,3 +9,4 @@ var PriorityFeeSetting;
     PriorityFeeSetting["Default"] = "Medium";
     PriorityFeeSetting["High"] = "High";
 })(PriorityFeeSetting || (exports.PriorityFeeSetting = PriorityFeeSetting = {}));
+exports.priorityFeeSettingValues = Object.values(PriorityFeeSetting);

package/dist/utils/generalUtils.d.ts

@@ -10,5 +10,5 @@ export declare function arraysAreEqual(arrayA: number[], arrayB: number[]): bool
 export declare function fetchTokenPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | undefined): number | undefined;
 export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
-export declare function retryWithExponentialBackoff<T>(fn: (attemptNum: number) => Promise<T>, retries?: number, delay?: number, errorsToThrow?: ErrorsToThrow): Promise<T>;
+export declare function retryWithExponentialBackoff<T>(fn: (attemptNum: number, prevErr?: Error) => Promise<T>, retries?: number, delay?: number, errorsToThrow?: ErrorsToThrow): Promise<T>;
 //# sourceMappingURL=generalUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAKlC,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AACD,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAsD5E;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAKlC,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AACD,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAsD5E;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ"}

package/dist/utils/generalUtils.js

@@ -97,8 +97,8 @@ function safeGetPrice(mint) {
 }
 function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToThrow) {
     return new Promise((resolve, reject) => {
-        const attempt = (attemptNum) => {
-            fn(attemptNum)
+        const attempt = (attemptNum, prevErr) => {
+            fn(attemptNum, prevErr)
                 .then(resolve)
                 .catch((error) => {
                 attemptNum++;
@@ -111,7 +111,7 @@ function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToThrow
                     consoleLog(error);
                     setTimeout(() => {
                         consoleLog("Retrying...");
-                        return attempt(attemptNum);
+                        return attempt(attemptNum, error);
                     }, delay);
                     delay *= 2;
                 }

package/package.json

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

@@ -17,16 +17,18 @@ import {
 import { getErrorInfo, getTransactionChores } from "./transactionUtils";
 import {
   PriorityFeeSetting,
+  priorityFeeSettingValues,
   TransactionItemInputs,
   TransactionRunType,
 } from "../types";
 import { ReferralStateManager, TxHandler } from "../clients";
+import { TransactionExpiredBlockheightExceededError } from "@solana/web3.js";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
 export class TransactionTooLargeError extends Error {
   constructor(message: string) {
     super(message);
-    this.name = 'TransactionTooLargeError';
+    this.name = "TransactionTooLargeError";
     Object.setPrototypeOf(this, TransactionTooLargeError.prototype);
   }
 }
@@ -204,10 +206,10 @@ export class TransactionsManager {
     private txHandler: SolautoClient | ReferralStateManager,
     private statusCallback?: (statuses: TransactionManagerStatuses) => void,
     private txType?: TransactionRunType,
-    private mustBeAtomic?: boolean,
+    private priorityFeeSetting: PriorityFeeSetting = PriorityFeeSetting.Min,
     private errorsToThrow?: ErrorsToThrow,
     private retries: number = 4,
-    private retryDelay: number = 150,
+    private retryDelay: number = 150
   ) {
     this.lookupTables = new LookupTables(
       this.txHandler.defaultLookupTables(),
@@ -321,9 +323,24 @@ export class TransactionsManager {
     }
   }
 
+  private getUpdatedPriorityFeeSetting(prevError?: Error) {
+    if (prevError instanceof TransactionExpiredBlockheightExceededError) {
+      const currIdx = priorityFeeSettingValues.indexOf(this.priorityFeeSetting);
+      return priorityFeeSettingValues[
+        Math.min(priorityFeeSettingValues.length - 1, currIdx + 1)
+      ];
+    }
+    return this.priorityFeeSetting;
+  }
+
+  private updateStatusForSets(itemSets: TransactionSet[]) {
+    itemSets.forEach((itemSet) => {
+      this.updateStatus(itemSet.name(), TransactionStatus.Queued, 0);
+    });
+  }
+
   public async clientSend(
-    transactions: TransactionItem[],
-    prioritySetting?: PriorityFeeSetting
+    transactions: TransactionItem[]
   ): Promise<TransactionManagerStatuses> {
     const items = [...transactions];
     const client = this.txHandler as SolautoClient;
@@ -336,12 +353,12 @@ export class TransactionsManager {
       updateLookupTable?.needsToBeIsolated
     ) {
       await retryWithExponentialBackoff(
-        async (attemptNum) =>
+        async (attemptNum, prevError) =>
           await this.sendTransaction(
             updateLookupTable.updateLutTx,
             updateLutTxName,
             attemptNum,
-            prioritySetting
+            this.getUpdatedPriorityFeeSetting(prevError)
           ),
         3,
         150,
@@ -385,7 +402,7 @@ export class TransactionsManager {
       );
     }
 
-    const result = await this.send(items, prioritySetting, true).catch((e) => {
+    const result = await this.send(items, true).catch((e) => {
       client.resetLiveTxUpdates(false);
       throw e;
     });
@@ -399,7 +416,6 @@ export class TransactionsManager {
 
   public async send(
     items: TransactionItem[],
-    prioritySetting?: PriorityFeeSetting,
     initialized?: boolean
   ): Promise<TransactionManagerStatuses> {
     this.statuses = [];
@@ -412,104 +428,99 @@ export class TransactionsManager {
     }
 
     const itemSets = await this.assembleTransactionSets(items);
-    const statusesStartIdx = this.statuses.length;
-    for (const itemSet of itemSets) {
-      this.updateStatus(itemSet.name(), TransactionStatus.Queued, 0);
-    }
+    this.updateStatusForSets(itemSets);
 
-    if (this.mustBeAtomic && itemSets.length > 1) {
-      throw new Error(
-        `${itemSets.length} transactions required but jito bundles are not currently supported`
+    if (this.txType === "only-simulate" && itemSets.length > 1) {
+      this.txHandler.log(
+        "Only simulate and more than 1 transaction. Skipping..."
       );
-      // itemSets.forEach((set) => {
-      //   this.updateStatus(set.name(), TransactionStatus.Processing);
-      // });
-      // await sendJitoBundledTransactions(
-      //   this.client,
-      //   await Promise.all(itemSets.map((x) => x.getSingleTransaction())),
-      //   this.simulateOnly
-      // );
-      // TODO: check if successful or not
-      // itemSets.forEach((set) => {
-      //   this.updateStatus(set.name(), TransactionStatus.Successful);
-      // });
-    } else if (this.txType !== "only-simulate" || itemSets.length === 1) {
-      for (let i = 0; i < itemSets.length; i++) {
-        const getFreshItemSet = async (
-          itemSet: TransactionSet,
-          attemptNum: number
-        ) => {
-          await itemSet.refetchAll(attemptNum);
-          const newItemSets = await this.assembleTransactionSets([
-            ...itemSet.items,
-            ...itemSets
-              .slice(i + 1)
-              .map((x) => x.items)
-              .flat(),
-          ]);
-          if (newItemSets.length > 1) {
-            this.statuses.splice(
-              statusesStartIdx + i,
-              itemSets.length - i,
-              ...newItemSets.map((x) => ({
-                name: x.name(),
-                status: TransactionStatus.Queued,
-                attemptNum: 0,
-              }))
-            );
-            this.txHandler.log(this.statuses);
-            itemSets.splice(
-              i + 1,
-              itemSets.length - i - 1,
-              ...newItemSets.slice(1)
-            );
-          }
-          return newItemSets.length > 0 ? newItemSets[0] : undefined;
-        };
-
-        let itemSet: TransactionSet | undefined = itemSets[i];
-        await retryWithExponentialBackoff(
-          async (attemptNum) => {
-            itemSet =
-              i > 0 || attemptNum > 0
-                ? await getFreshItemSet(itemSet!, attemptNum)
-                : itemSet;
-            if (!itemSet) {
-              return;
-            }
-            const tx = await itemSet.getSingleTransaction();
-
-            if (tx.getInstructions().length === 0) {
-              this.updateStatus(
-                itemSet.name(),
-                TransactionStatus.Skipped,
-                attemptNum
-              );
-            } else {
-              await this.debugAccounts(itemSet, tx);
-              await this.sendTransaction(
-                tx,
-                itemSet.name(),
-                attemptNum,
-                prioritySetting
-              );
-            }
-          },
+      return [];
+    }
+
+    let currentIndex = 0;
+    while (currentIndex < itemSets.length) {
+      await this.processTransactionSet(itemSets, currentIndex);
+      currentIndex++;
+    }
+
+    return this.statuses;
+  }
+
+  private async processTransactionSet(
+    itemSets: TransactionSet[],
+    currentIndex: number
+  ) {
+    let itemSet: TransactionSet | undefined = itemSets[currentIndex];
+
+    await retryWithExponentialBackoff(
+      async (attemptNum, prevError) => {
+        if (currentIndex > 0 || attemptNum > 0) {
+          itemSet = await this.refreshItemSet(
+            itemSets,
+            currentIndex,
+            attemptNum
+          );
+        }
+        if (!itemSet) return;
+
+        const tx = await itemSet.getSingleTransaction();
+        if (tx.getInstructions().length === 0) {
+          this.updateStatus(
+            itemSet.name(),
+            TransactionStatus.Skipped,
+            attemptNum
+          );
+        } else {
+          await this.debugAccounts(itemSet, tx);
+          await this.sendTransaction(
+            tx,
+            itemSet.name(),
+            attemptNum,
+            this.getUpdatedPriorityFeeSetting(prevError)
+          );
+        }
+      },
+      this.retries,
+      this.retryDelay,
+      this.errorsToThrow
+    ).catch((e) => {
+      if (itemSet) {
+        this.updateStatus(
+          itemSet.name(),
+          TransactionStatus.Failed,
           this.retries,
-          this.retryDelay,
-          this.errorsToThrow
         );
       }
-    }
+      throw e;
+    });
+  }
 
-    return this.statuses;
+  private async refreshItemSet(
+    itemSets: TransactionSet[],
+    currentIndex: number,
+    attemptNum: number
+  ): Promise<TransactionSet | undefined> {
+    const itemSet = itemSets[currentIndex];
+    await itemSet.refetchAll(attemptNum);
+  
+    const newItemSets = await this.assembleTransactionSets([
+      ...itemSet.items,
+      ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
+    ]);
+  
+    if (newItemSets.length > 1) {
+      itemSets.splice(currentIndex + 1, itemSets.length - currentIndex - 1, ...newItemSets.slice(1));
+      this.updateStatusForSets(newItemSets.slice(1));
+    }
+  
+    return newItemSets[0];
   }
 
   private async sendTransaction(
     tx: TransactionBuilder,
     txName: string,
     attemptNum: number,
-    prioritySetting?: PriorityFeeSetting
+    priorityFeeSetting?: PriorityFeeSetting
   ) {
     this.updateStatus(txName, TransactionStatus.Processing, attemptNum);
     try {
@@ -518,7 +529,7 @@ export class TransactionsManager {
         this.txHandler.connection,
         tx,
         this.txType,
-        prioritySetting,
+        priorityFeeSetting,
         () =>
           this.updateStatus(
             txName,

package/src/types/solauto.ts

@@ -21,6 +21,8 @@ export enum PriorityFeeSetting {
   High = "High",
 }
 
+export const priorityFeeSettingValues = Object.values(PriorityFeeSetting) as PriorityFeeSetting[];
+
 export type RebalanceAction = "boost" | "repay" | "dca";
 
 export type TransactionRunType = "skip-simulation" | "only-simulate" | "normal";

package/src/utils/generalUtils.ts

@@ -125,14 +125,14 @@ export function safeGetPrice(
 export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
 
 export function retryWithExponentialBackoff<T>(
-  fn: (attemptNum: number) => Promise<T>,
+  fn: (attemptNum: number, prevErr?: Error) => Promise<T>,
   retries: number = 5,
   delay: number = 150,
   errorsToThrow?: ErrorsToThrow
 ): Promise<T> {
   return new Promise((resolve, reject) => {
-    const attempt = (attemptNum: number) => {
-      fn(attemptNum)
+    const attempt = (attemptNum: number, prevErr?: Error) => {
+      fn(attemptNum, prevErr)
         .then(resolve)
         .catch((error: Error) => {
           attemptNum++;
@@ -149,7 +149,7 @@ export function retryWithExponentialBackoff<T>(
             consoleLog(error);
             setTimeout(() => {
               consoleLog("Retrying...");
-              return attempt(attemptNum);
+              return attempt(attemptNum, error);
             }, delay);
             delay *= 2;
           } else {

package/tests/transactions/solautoMarginfi.ts

@@ -14,9 +14,10 @@ import {
   toBaseUnit,
 } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
-import { fetchTokenPrices } from "../../src/utils/generalUtils";
+import { consoleLog, fetchTokenPrices } from "../../src/utils/generalUtils";
 import {
   TransactionItem,
+  TransactionManagerStatuses,
   TransactionsManager,
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
@@ -29,8 +30,7 @@ describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest("solauto-manager");
 
   const payForTransactions = false;
-  const useJitoBundle = false;
-  const positionId = 1;
+  const positionId = 2;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -49,8 +49,8 @@ describe("Solauto Marginfi tests", async () => {
       // marginfiAccount: new PublicKey(
       //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
       // ),
-      // supplyMint: NATIVE_MINT,
-      // debtMint: new PublicKey(USDC),
+      supplyMint: NATIVE_MINT,
+      debtMint: new PublicKey(USDC),
     });
 
     const transactionItems: TransactionItem[] = [];
@@ -78,7 +78,7 @@ describe("Solauto Marginfi tests", async () => {
     //       // const [supplyPrice] = await fetchTokenPrices([supply]);
     //       return {
     //         tx: client.protocolInteraction(
-    //           solautoAction("Deposit", [toBaseUnit(9, supplyDecimals)])
+    //           solautoAction("Deposit", [toBaseUnit(0.5, supplyDecimals)])
     //         ),
     //       };
     //     }, "deposit")
@@ -117,6 +117,14 @@ describe("Solauto Marginfi tests", async () => {
       )
     );
 
+    // transactionItems.push(
+    //   new TransactionItem(
+    //     async (attemptNum) =>
+    //       await buildSolautoRebalanceTransaction(client, 0, attemptNum),
+    //     "rebalance"
+    //   )
+    // );
+
     // transactionItems.push(
     //   new TransactionItem(
     //     async () => ({
@@ -137,11 +145,15 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    await new TransactionsManager(
+    const statuses = await new TransactionsManager(
       client,
-      undefined,
+      (statuses: TransactionManagerStatuses) => {
+        console.log(statuses);
+      },
       !payForTransactions ? "only-simulate" : "normal",
-      useJitoBundle
-    ).clientSend(transactionItems, PriorityFeeSetting.Min);
+      PriorityFeeSetting.Low
+    ).clientSend(transactionItems);
+
+    // console.log(statuses);
   });
 });