@haven-fi/solauto-sdk 1.0.744 → 1.0.746

package/README.md

@@ -6,6 +6,7 @@ Solauto is a program on the Solana blockchain that lets you manage leveraged lon
 
 ```typescript
 import { PublicKey } from "@solana/web3.js";
+import { NATIVE_MINT } from "@solana/spl-token";
 import * as solauto from "@haven-fi/solauto-sdk";
 
 // Create new Solauto client
@@ -15,8 +16,8 @@ const client = solauto.getClient(solauto.LendingPlatform.MARGINFI, {
 });
 
 // Initialize the client
-const supplyMint = new PublicKey(NATIVE_MINT);
-const debtMint = new PublicKey(USDC);
+const supplyMint = NATIVE_MINT;
+const debtMint = new PublicKey(solauto.USDC);
 await client.initializeNewSolautoPosition({
   positionId: 1,
   lpPoolAccount: solauto.getMarginfiAccounts().defaultGroup,
@@ -75,7 +76,6 @@ const statuses = txManager.send(transactionItems);
 ## Rebalancing an existing position
 
 ```typescript
-import { PublicKey } from "@solana/web3.js";
 import * as solauto from "@haven-fi/solauto-sdk";
 
 // Create new Solauto client

package/dist/services/transactions/manager/transactionsManager.d.ts

@@ -59,12 +59,12 @@ export declare class TransactionsManager<T extends TxHandler> {
     private updateStatusForSets;
     send(items: TransactionItem[]): Promise<TransactionManagerStatuses>;
     private shouldProceedToSend;
-    private getTrueAttemptNum;
-    private sendJitoBundle;
+    private refreshItemSets;
     private processTransactionsAtomically;
+    private sendJitoBundle;
     private processTransactionSet;
-    private refreshItemSets;
     protected sendTransaction(tx: TransactionBuilder, name: string, attemptNum: number, priorityFeeSetting?: PriorityFeeSetting, txRunType?: TransactionRunType): Promise<void>;
+    private captureErrorInfo;
 }
 export {};
 //# sourceMappingURL=transactionsManager.d.ts.map

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

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

package/dist/services/transactions/manager/transactionsManager.js

@@ -46,7 +46,7 @@ class TransactionsManager {
     }
     async assembleTransactionSets(items) {
         let transactionSets = [];
-        this.txHandler.log(`Reassembling ${items.length} items`);
+        (0, utils_1.consoleLog)(`Reassembling ${items.length} items`);
         const txItems = items.sort((a, b) => a.orderPrio - b.orderPrio);
         for (let i = txItems.length - 1; i >= 0;) {
             let item = txItems[i];
@@ -101,7 +101,7 @@ class TransactionsManager {
                 this.statuses.push(args);
             }
         }
-        this.txHandler.log(`${args.name} ${args.attemptNum} is ${args.status.toString().toLowerCase()}`);
+        (0, utils_1.consoleLog)(`${args.name} ${args.attemptNum} is ${args.status.toString().toLowerCase()}`);
         this.statusCallback?.([...this.statuses]);
     }
     async debugAccounts(itemSet, tx) {
@@ -110,11 +110,11 @@ class TransactionsManager {
         for (const ix of tx.getInstructions()) {
             const ixAccounts = ix.keys.map((x) => x.pubkey);
             const accountsNotInLut = ixAccounts.filter((x) => !lutAccounts.includes(x));
-            this.txHandler.log(`Program ${ix.programId}, data len: ${ix.data.length}, LUT accounts data: ${ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3}`);
+            (0, utils_1.consoleLog)(`Program ${ix.programId}, data len: ${ix.data.length}, LUT accounts data: ${ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3}`);
             if (accountsNotInLut.length > 0) {
-                this.txHandler.log(`${accountsNotInLut.length} accounts not in LUT:`);
+                (0, utils_1.consoleLog)(`${accountsNotInLut.length} accounts not in LUT:`);
                 for (const key of accountsNotInLut) {
-                    this.txHandler.log(key.toString());
+                    (0, utils_1.consoleLog)(key.toString());
                 }
             }
         }
@@ -126,10 +126,10 @@ class TransactionsManager {
         }
         return this.priorityFeeSetting;
     }
-    updateStatusForSets(itemSets, args, txSigs, reset) {
-        itemSets.forEach((itemSet, i) => {
+    updateStatusForSets(txNames, args, txSigs, reset) {
+        txNames.forEach((name, i) => {
             this.updateStatus({
-                name: itemSet.name(),
+                name,
                 txSig: txSigs && txSigs.length > i ? txSigs[i] : undefined,
                 ...args,
             }, reset);
@@ -144,14 +144,14 @@ class TransactionsManager {
                     await item.initialize();
                 }
             }
-            this.txHandler.log("Transaction items:", items.length);
+            (0, utils_1.consoleLog)("Transaction items:", items.length);
             return await this.assembleTransactionSets(items);
         }, this.totalRetries);
-        this.updateStatusForSets(itemSets, {
+        this.updateStatusForSets(itemSets.map((x) => x.name()), {
             status: TransactionStatus.Queued,
             attemptNum: 0,
         });
-        this.txHandler.log("Initial item sets:", itemSets.length);
+        (0, utils_1.consoleLog)("Initial item sets:", itemSets.length);
         if (this.atomically) {
             await this.processTransactionsAtomically(itemSets);
         }
@@ -165,14 +165,14 @@ class TransactionsManager {
         return this.statuses;
     }
     shouldProceedToSend(itemSets, attemptNum) {
-        if (!itemSets) {
+        if (itemSets.length === 0) {
             return false;
         }
         const newItemSetNames = itemSets.flatMap((x) => x.items.map((y) => y.name ?? ""));
         if (newItemSetNames.length === 1 &&
             newItemSetNames[0] === this.updateOracleTxName) {
             (0, utils_1.consoleLog)("Skipping unnecessary oracle update");
-            this.updateStatusForSets(itemSets, {
+            this.updateStatusForSets(itemSets.map((x) => x.name()), {
                 status: TransactionStatus.Skipped,
                 attemptNum,
             });
@@ -180,113 +180,109 @@ class TransactionsManager {
         }
         return true;
     }
-    getTrueAttemptNum(itemSetName) {
-        const prevAttempts = this.statuses.filter((x) => x.name === itemSetName && x.status !== TransactionStatus.Queued);
-        const attemptNum = prevAttempts.length -
-            prevAttempts.filter((x) => x.status === TransactionStatus.Skipped)
-                ?.length;
-        return attemptNum;
+    async refreshItemSets(itemSets, attemptNum, prevError, currentIndex) {
+        if (currentIndex !== undefined) {
+            const itemSet = itemSets[currentIndex];
+            await itemSet.reset();
+            await itemSet.refetchAll(attemptNum, prevError);
+        }
+        else {
+            await Promise.all(itemSets.map((itemSet) => itemSet.reset()));
+            for (const itemSet of itemSets) {
+                await itemSet.refetchAll(attemptNum, prevError);
+            }
+        }
+        const newItemSets = await this.assembleTransactionSets(currentIndex !== undefined
+            ? [
+                ...itemSets[currentIndex].items,
+                ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
+            ]
+            : itemSets.flatMap((set) => set.items));
+        if (currentIndex !== undefined && newItemSets.length > 1) {
+            itemSets.splice(currentIndex, itemSets.length - currentIndex, ...newItemSets);
+            const startOfQueuedStatuses = this.statuses.findIndex((x) => x.status === TransactionStatus.Queued);
+            this.statuses.splice(startOfQueuedStatuses, this.statuses.length - startOfQueuedStatuses, ...newItemSets.map((x, i) => ({
+                name: x.name(),
+                attemptNum: i === 0 ? attemptNum : 0,
+                status: i === 0 ? TransactionStatus.Processing : TransactionStatus.Queued,
+            })));
+        }
+        return newItemSets;
+    }
+    async processTransactionsAtomically(itemSets) {
+        await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => {
+            if (prevError &&
+                this.statuses.filter((x) => x.simulationSuccessful).length >
+                    this.signableRetries) {
+                throw prevError;
+            }
+            this.priorityFeeSetting = this.getUpdatedPriorityFeeSetting(prevError, attemptNum);
+            if (attemptNum > 0) {
+                const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError);
+                if (!refreshedSets || !refreshedSets.length) {
+                    return;
+                }
+                else {
+                    itemSets = refreshedSets;
+                }
+            }
+            if (!this.shouldProceedToSend(itemSets, attemptNum)) {
+                return;
+            }
+            await this.sendJitoBundle(itemSets, attemptNum);
+        }, this.totalRetries, this.retryDelay, this.errorsToThrow);
     }
     async sendJitoBundle(itemSets, attemptNum) {
         let transactions = [];
+        let txNames = [];
         try {
             for (const set of itemSets) {
                 transactions.push(await set.getSingleTransaction());
             }
             transactions = transactions.filter((x) => x.getInstructions().length > 0);
+            txNames = itemSets.map((x) => x.name());
             if (transactions.length === 0) {
-                this.updateStatusForSets(itemSets, {
+                this.updateStatusForSets(txNames, {
                     status: TransactionStatus.Skipped,
                     attemptNum,
                 });
                 return;
             }
-            this.updateStatusForSets(itemSets, {
+            this.updateStatusForSets(txNames, {
                 status: TransactionStatus.Processing,
                 attemptNum,
             }, undefined, true);
             for (const itemSet of itemSets) {
                 await this.debugAccounts(itemSet, await itemSet.getSingleTransaction());
             }
-            let txSigs;
-            let error;
-            try {
-                txSigs = await (0, utils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, this.txHandler.otherSigners, transactions, this.txRunType, this.priorityFeeSetting, () => this.updateStatusForSets(itemSets, {
-                    status: TransactionStatus.Processing,
-                    attemptNum,
-                    simulationSuccessful: true,
-                }), this.abortController);
-            }
-            catch (e) {
-                error = e;
-            }
-            if (error ||
-                (this.txRunType !== "only-simulate" &&
-                    (!Boolean(txSigs) || txSigs?.length === 0) &&
-                    !this.abortController?.signal.aborted)) {
-                this.updateStatusForSets(itemSets, {
+            const txSigs = await (0, utils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, this.txHandler.otherSigners, transactions, this.txRunType, this.priorityFeeSetting, () => this.updateStatusForSets(txNames, {
+                status: TransactionStatus.Processing,
+                attemptNum,
+                simulationSuccessful: true,
+            }), this.abortController);
+            if (this.txRunType !== "only-simulate" &&
+                (!Boolean(txSigs) || txSigs?.length === 0) &&
+                !this.abortController?.signal.aborted) {
+                this.updateStatusForSets(txNames, {
                     status: TransactionStatus.Failed,
                     attemptNum,
-                    moreInfo: error?.message,
                 }, txSigs);
-                throw error ? error : new Error("Unknown error");
             }
-            this.updateStatusForSets(itemSets, { status: TransactionStatus.Successful, attemptNum }, txSigs);
+            this.updateStatusForSets(txNames, { status: TransactionStatus.Successful, attemptNum }, txSigs);
         }
         catch (e) {
-            this.txHandler.log("Capturing error info...");
-            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, transactions, e, itemSets.filter((x) => this.statuses.find((y) => x.name() === y.name && y.attemptNum === attemptNum)?.simulationSuccessful).length === itemSets.length, this.priorityFeeSetting);
-            const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
-            const errorInfo = errorDetails.errorName || errorDetails.errorInfo
-                ? errorString
-                : e.message;
-            this.updateStatusForSets(itemSets, {
-                status: errorDetails.canBeIgnored
-                    ? TransactionStatus.Skipped
-                    : TransactionStatus.Failed,
-                attemptNum,
-                moreInfo: errorInfo,
-            });
-            (0, utils_1.consoleLog)(errorString);
-            if (!errorDetails.canBeIgnored) {
-                throw new Error(errorInfo);
-            }
+            this.captureErrorInfo(transactions, txNames, attemptNum, e);
         }
     }
-    async processTransactionsAtomically(itemSets) {
-        await (0, utils_1.retryWithExponentialBackoff)(async (retryNum, prevError) => {
-            if (prevError &&
-                this.statuses.filter((x) => x.simulationSuccessful).length >
-                    this.signableRetries) {
-                throw prevError;
-            }
-            const attemptNum = Math.max(...itemSets.map((x) => this.getTrueAttemptNum(x?.name() ?? "")));
-            this.priorityFeeSetting = this.getUpdatedPriorityFeeSetting(prevError, attemptNum);
-            if (retryNum > 0) {
-                const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError);
-                if (!refreshedSets || !refreshedSets.length) {
-                    return;
-                }
-                else {
-                    itemSets = refreshedSets;
-                }
-            }
-            if (!this.shouldProceedToSend(itemSets, attemptNum)) {
-                return;
-            }
-            await this.sendJitoBundle(itemSets, attemptNum);
-        }, this.totalRetries, this.retryDelay, this.errorsToThrow);
-    }
     async processTransactionSet(itemSets, currentIndex) {
         let itemSet = itemSets[currentIndex];
-        await (0, utils_1.retryWithExponentialBackoff)(async (retryNum, prevError) => {
+        await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => {
             if (prevError &&
                 this.statuses.filter((x) => x.simulationSuccessful).length >
                     this.signableRetries) {
                 throw prevError;
             }
-            const attemptNum = this.getTrueAttemptNum(itemSet?.name() ?? "");
-            if (currentIndex > 0 || retryNum > 0) {
+            if (currentIndex > 0 || attemptNum > 0) {
                 const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError, currentIndex);
                 itemSet = refreshedSets ? refreshedSets[0] : undefined;
             }
@@ -308,35 +304,6 @@ class TransactionsManager {
             }
         }, this.totalRetries, this.retryDelay, this.errorsToThrow);
     }
-    async refreshItemSets(itemSets, attemptNum, prevError, currentIndex) {
-        if (currentIndex !== undefined) {
-            const itemSet = itemSets[currentIndex];
-            await itemSet.reset();
-            await itemSet.refetchAll(attemptNum, prevError);
-        }
-        else {
-            await Promise.all(itemSets.map((itemSet) => itemSet.reset()));
-            for (const itemSet of itemSets) {
-                await itemSet.refetchAll(attemptNum, prevError);
-            }
-        }
-        const newItemSets = await this.assembleTransactionSets(currentIndex !== undefined
-            ? [
-                ...itemSets[currentIndex].items,
-                ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
-            ]
-            : itemSets.flatMap((set) => set.items));
-        if (currentIndex !== undefined && newItemSets.length > 1) {
-            itemSets.splice(currentIndex, itemSets.length - currentIndex, ...newItemSets);
-            const startOfQueuedStatuses = this.statuses.findIndex((x) => x.status === TransactionStatus.Queued);
-            this.statuses.splice(startOfQueuedStatuses, this.statuses.length - startOfQueuedStatuses, ...newItemSets.map((x, i) => ({
-                name: x.name(),
-                attemptNum: i === 0 ? attemptNum : 0,
-                status: i === 0 ? TransactionStatus.Processing : TransactionStatus.Queued,
-            })));
-        }
-        return newItemSets;
-    }
     async sendTransaction(tx, name, attemptNum, priorityFeeSetting, txRunType) {
         this.updateStatus({
             name,
@@ -358,24 +325,27 @@ class TransactionsManager {
             });
         }
         catch (e) {
-            this.txHandler.log("Capturing error info...");
-            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, [tx], e, this.statuses.find((x) => x.name === name && x.attemptNum === attemptNum)?.simulationSuccessful, priorityFeeSetting);
-            const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
-            const errorInfo = errorDetails.errorName || errorDetails.errorInfo
-                ? errorString
-                : e.message;
-            this.updateStatus({
-                name,
-                status: errorDetails.canBeIgnored
-                    ? TransactionStatus.Skipped
-                    : TransactionStatus.Failed,
-                attemptNum,
-                moreInfo: errorInfo,
-            });
-            (0, utils_1.consoleLog)(errorString);
-            if (!errorDetails.canBeIgnored) {
-                throw new Error(errorInfo);
-            }
+            this.captureErrorInfo([tx], [name], attemptNum, e);
+        }
+    }
+    captureErrorInfo(transactions, txNames, attemptNum, error) {
+        (0, utils_1.consoleLog)("Capturing error info...");
+        const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, transactions, error, txNames.filter((x) => this.statuses.find((y) => x === y.name && y.attemptNum === attemptNum)
+            ?.simulationSuccessful).length === txNames.length, this.priorityFeeSetting);
+        const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
+        const errorInfo = errorDetails.errorName || errorDetails.errorInfo
+            ? errorString
+            : error.message;
+        this.updateStatusForSets(txNames, {
+            status: errorDetails.canBeIgnored
+                ? TransactionStatus.Skipped
+                : TransactionStatus.Failed,
+            attemptNum,
+            moreInfo: errorInfo,
+        });
+        (0, utils_1.consoleLog)(errorString);
+        if (!errorDetails.canBeIgnored) {
+            throw new Error(errorInfo);
         }
     }
 }

package/local/txSandbox.ts

@@ -54,7 +54,7 @@ export async function main() {
     // ),
   });
 
-  const transactionItems = [rebalance(client, undefined, 350)];
+  const transactionItems = [rebalance(client)];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,

package/package.json

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

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

@@ -101,7 +101,7 @@ export class TransactionsManager<T extends TxHandler> {
     items: TransactionItem[]
   ): Promise<TransactionSet[]> {
     let transactionSets: TransactionSet[] = [];
-    this.txHandler.log(`Reassembling ${items.length} items`);
+    consoleLog(`Reassembling ${items.length} items`);
 
     const txItems = items.sort((a, b) => a.orderPrio - b.orderPrio);
 
@@ -164,7 +164,7 @@ export class TransactionsManager<T extends TxHandler> {
         this.statuses.push(args);
       }
     }
-    this.txHandler.log(
+    consoleLog(
       `${args.name} ${args.attemptNum} is ${args.status.toString().toLowerCase()}`
     );
     this.statusCallback?.([...this.statuses]);
@@ -178,13 +178,13 @@ export class TransactionsManager<T extends TxHandler> {
       const accountsNotInLut = ixAccounts.filter(
         (x) => !lutAccounts.includes(x)
       );
-      this.txHandler.log(
+      consoleLog(
         `Program ${ix.programId}, data len: ${ix.data.length}, LUT accounts data: ${ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3}`
       );
       if (accountsNotInLut.length > 0) {
-        this.txHandler.log(`${accountsNotInLut.length} accounts not in LUT:`);
+        consoleLog(`${accountsNotInLut.length} accounts not in LUT:`);
         for (const key of accountsNotInLut) {
-          this.txHandler.log(key.toString());
+          consoleLog(key.toString());
         }
       }
     }
@@ -207,15 +207,15 @@ export class TransactionsManager<T extends TxHandler> {
   }
 
   private updateStatusForSets(
-    itemSets: TransactionSet[],
+    txNames: string[],
     args: Omit<TransactionManagerStatus, "name">,
     txSigs?: string[],
     reset?: boolean
   ) {
-    itemSets.forEach((itemSet, i) => {
+    txNames.forEach((name, i) => {
       this.updateStatus(
         {
-          name: itemSet.name(),
+          name,
           txSig: txSigs && txSigs.length > i ? txSigs[i] : undefined,
           ...args,
         },
@@ -236,15 +236,18 @@ export class TransactionsManager<T extends TxHandler> {
           await item.initialize();
         }
       }
-      this.txHandler.log("Transaction items:", items.length);
+      consoleLog("Transaction items:", items.length);
       return await this.assembleTransactionSets(items);
     }, this.totalRetries);
 
-    this.updateStatusForSets(itemSets, {
-      status: TransactionStatus.Queued,
-      attemptNum: 0,
-    });
-    this.txHandler.log("Initial item sets:", itemSets.length);
+    this.updateStatusForSets(
+      itemSets.map((x) => x.name()),
+      {
+        status: TransactionStatus.Queued,
+        attemptNum: 0,
+      }
+    );
+    consoleLog("Initial item sets:", itemSets.length);
 
     if (this.atomically) {
       await this.processTransactionsAtomically(itemSets);
@@ -260,7 +263,7 @@ export class TransactionsManager<T extends TxHandler> {
   }
 
   private shouldProceedToSend(itemSets: TransactionSet[], attemptNum: number) {
-    if (!itemSets) {
+    if (itemSets.length === 0) {
       return false;
     }
 
@@ -272,37 +275,123 @@ export class TransactionsManager<T extends TxHandler> {
       newItemSetNames[0] === this.updateOracleTxName
     ) {
       consoleLog("Skipping unnecessary oracle update");
-      this.updateStatusForSets(itemSets, {
-        status: TransactionStatus.Skipped,
-        attemptNum,
-      });
+      this.updateStatusForSets(
+        itemSets.map((x) => x.name()),
+        {
+          status: TransactionStatus.Skipped,
+          attemptNum,
+        }
+      );
       return false;
     }
 
     return true;
   }
 
-  private getTrueAttemptNum(itemSetName: string) {
-    const prevAttempts = this.statuses.filter(
-      (x) => x.name === itemSetName && x.status !== TransactionStatus.Queued
+  private async refreshItemSets(
+    itemSets: TransactionSet[],
+    attemptNum: number,
+    prevError?: Error,
+    currentIndex?: number
+  ): Promise<TransactionSet[] | undefined> {
+    if (currentIndex !== undefined) {
+      const itemSet = itemSets[currentIndex];
+      await itemSet.reset();
+      await itemSet.refetchAll(attemptNum, prevError);
+    } else {
+      await Promise.all(itemSets.map((itemSet) => itemSet.reset()));
+      for (const itemSet of itemSets) {
+        await itemSet.refetchAll(attemptNum, prevError);
+      }
+    }
+
+    const newItemSets = await this.assembleTransactionSets(
+      currentIndex !== undefined
+        ? [
+            ...itemSets[currentIndex].items,
+            ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
+          ]
+        : itemSets.flatMap((set) => set.items)
+    );
+
+    if (currentIndex !== undefined && newItemSets.length > 1) {
+      itemSets.splice(
+        currentIndex,
+        itemSets.length - currentIndex,
+        ...newItemSets
+      );
+      const startOfQueuedStatuses = this.statuses.findIndex(
+        (x) => x.status === TransactionStatus.Queued
+      );
+      this.statuses.splice(
+        startOfQueuedStatuses,
+        this.statuses.length - startOfQueuedStatuses,
+        ...newItemSets.map((x, i) => ({
+          name: x.name(),
+          attemptNum: i === 0 ? attemptNum : 0,
+          status:
+            i === 0 ? TransactionStatus.Processing : TransactionStatus.Queued,
+        }))
+      );
+    }
+
+    return newItemSets;
+  }
+
+  private async processTransactionsAtomically(itemSets: TransactionSet[]) {
+    await retryWithExponentialBackoff(
+      async (attemptNum, prevError) => {
+        if (
+          prevError &&
+          this.statuses.filter((x) => x.simulationSuccessful).length >
+            this.signableRetries
+        ) {
+          throw prevError;
+        }
+
+        this.priorityFeeSetting = this.getUpdatedPriorityFeeSetting(
+          prevError,
+          attemptNum
+        );
+
+        if (attemptNum > 0) {
+          const refreshedSets = await this.refreshItemSets(
+            itemSets,
+            attemptNum,
+            prevError
+          );
+          if (!refreshedSets || !refreshedSets.length) {
+            return;
+          } else {
+            itemSets = refreshedSets;
+          }
+        }
+
+        if (!this.shouldProceedToSend(itemSets, attemptNum)) {
+          return;
+        }
+
+        await this.sendJitoBundle(itemSets, attemptNum);
+      },
+      this.totalRetries,
+      this.retryDelay,
+      this.errorsToThrow
     );
-    const attemptNum =
-      prevAttempts.length -
-      prevAttempts.filter((x) => x.status === TransactionStatus.Skipped)
-        ?.length;
-    return attemptNum;
   }
 
   private async sendJitoBundle(itemSets: TransactionSet[], attemptNum: number) {
     let transactions: TransactionBuilder[] = [];
+    let txNames: string[] = [];
 
     try {
       for (const set of itemSets) {
         transactions.push(await set.getSingleTransaction());
       }
       transactions = transactions.filter((x) => x.getInstructions().length > 0);
+
+      txNames = itemSets.map((x) => x.name());
       if (transactions.length === 0) {
-        this.updateStatusForSets(itemSets, {
+        this.updateStatusForSets(txNames, {
           status: TransactionStatus.Skipped,
           attemptNum,
         });
@@ -310,7 +399,7 @@ export class TransactionsManager<T extends TxHandler> {
       }
 
       this.updateStatusForSets(
-        itemSets,
+        txNames,
         {
           status: TransactionStatus.Processing,
           attemptNum,
@@ -322,139 +411,55 @@ export class TransactionsManager<T extends TxHandler> {
         await this.debugAccounts(itemSet, await itemSet.getSingleTransaction());
       }
 
-      let txSigs: string[] | undefined;
-      let error: Error | undefined;
-      try {
-        txSigs = await sendJitoBundledTransactions(
-          this.txHandler.umi,
-          this.txHandler.connection,
-          this.txHandler.signer,
-          this.txHandler.otherSigners,
-          transactions,
-          this.txRunType,
-          this.priorityFeeSetting,
-          () =>
-            this.updateStatusForSets(itemSets, {
-              status: TransactionStatus.Processing,
-              attemptNum,
-              simulationSuccessful: true,
-            }),
-          this.abortController
-        );
-      } catch (e: any) {
-        error = e as Error;
-      }
+      const txSigs = await sendJitoBundledTransactions(
+        this.txHandler.umi,
+        this.txHandler.connection,
+        this.txHandler.signer,
+        this.txHandler.otherSigners,
+        transactions,
+        this.txRunType,
+        this.priorityFeeSetting,
+        () =>
+          this.updateStatusForSets(txNames, {
+            status: TransactionStatus.Processing,
+            attemptNum,
+            simulationSuccessful: true,
+          }),
+        this.abortController
+      );
 
       if (
-        error ||
-        (this.txRunType !== "only-simulate" &&
-          (!Boolean(txSigs) || txSigs?.length === 0) &&
-          !this.abortController?.signal.aborted)
+        this.txRunType !== "only-simulate" &&
+        (!Boolean(txSigs) || txSigs?.length === 0) &&
+        !this.abortController?.signal.aborted
       ) {
         this.updateStatusForSets(
-          itemSets,
+          txNames,
           {
             status: TransactionStatus.Failed,
             attemptNum,
-            moreInfo: error?.message,
           },
           txSigs
         );
-        throw error ? error : new Error("Unknown error");
       }
 
       this.updateStatusForSets(
-        itemSets,
+        txNames,
         { status: TransactionStatus.Successful, attemptNum },
         txSigs
       );
     } catch (e: any) {
-      this.txHandler.log("Capturing error info...");
-      const errorDetails = getErrorInfo(
-        this.txHandler.umi,
-        transactions,
-        e,
-        itemSets.filter(
-          (x) =>
-            this.statuses.find(
-              (y) => x.name() === y.name && y.attemptNum === attemptNum
-            )?.simulationSuccessful
-        ).length === itemSets.length,
-        this.priorityFeeSetting
-      );
-
-      const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
-      const errorInfo =
-        errorDetails.errorName || errorDetails.errorInfo
-          ? errorString
-          : e.message;
-      this.updateStatusForSets(itemSets, {
-        status: errorDetails.canBeIgnored
-          ? TransactionStatus.Skipped
-          : TransactionStatus.Failed,
-        attemptNum,
-        moreInfo: errorInfo,
-      });
-      consoleLog(errorString);
-
-      if (!errorDetails.canBeIgnored) {
-        throw new Error(errorInfo);
-      }
+      this.captureErrorInfo(transactions, txNames, attemptNum, e);
     }
   }
 
-  private async processTransactionsAtomically(itemSets: TransactionSet[]) {
-    await retryWithExponentialBackoff(
-      async (retryNum, prevError) => {
-        if (
-          prevError &&
-          this.statuses.filter((x) => x.simulationSuccessful).length >
-            this.signableRetries
-        ) {
-          throw prevError;
-        }
-
-        const attemptNum = Math.max(
-          ...itemSets.map((x) => this.getTrueAttemptNum(x?.name() ?? ""))
-        );
-
-        this.priorityFeeSetting = this.getUpdatedPriorityFeeSetting(
-          prevError,
-          attemptNum
-        );
-
-        if (retryNum > 0) {
-          const refreshedSets = await this.refreshItemSets(
-            itemSets,
-            attemptNum,
-            prevError
-          );
-          if (!refreshedSets || !refreshedSets.length) {
-            return;
-          } else {
-            itemSets = refreshedSets;
-          }
-        }
-
-        if (!this.shouldProceedToSend(itemSets, attemptNum)) {
-          return;
-        }
-
-        await this.sendJitoBundle(itemSets, attemptNum);
-      },
-      this.totalRetries,
-      this.retryDelay,
-      this.errorsToThrow
-    );
-  }
-
   private async processTransactionSet(
     itemSets: TransactionSet[],
     currentIndex: number
   ) {
     let itemSet: TransactionSet | undefined = itemSets[currentIndex];
     await retryWithExponentialBackoff(
-      async (retryNum, prevError) => {
+      async (attemptNum, prevError) => {
         if (
           prevError &&
           this.statuses.filter((x) => x.simulationSuccessful).length >
@@ -463,8 +468,7 @@ export class TransactionsManager<T extends TxHandler> {
           throw prevError;
         }
 
-        const attemptNum = this.getTrueAttemptNum(itemSet?.name() ?? "");
-        if (currentIndex > 0 || retryNum > 0) {
+        if (currentIndex > 0 || attemptNum > 0) {
           const refreshedSets = await this.refreshItemSets(
             itemSets,
             attemptNum,
@@ -504,56 +508,6 @@ export class TransactionsManager<T extends TxHandler> {
     );
   }
 
-  private async refreshItemSets(
-    itemSets: TransactionSet[],
-    attemptNum: number,
-    prevError?: Error,
-    currentIndex?: number
-  ): Promise<TransactionSet[] | undefined> {
-    if (currentIndex !== undefined) {
-      const itemSet = itemSets[currentIndex];
-      await itemSet.reset();
-      await itemSet.refetchAll(attemptNum, prevError);
-    } else {
-      await Promise.all(itemSets.map((itemSet) => itemSet.reset()));
-      for (const itemSet of itemSets) {
-        await itemSet.refetchAll(attemptNum, prevError);
-      }
-    }
-
-    const newItemSets = await this.assembleTransactionSets(
-      currentIndex !== undefined
-        ? [
-            ...itemSets[currentIndex].items,
-            ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
-          ]
-        : itemSets.flatMap((set) => set.items)
-    );
-
-    if (currentIndex !== undefined && newItemSets.length > 1) {
-      itemSets.splice(
-        currentIndex,
-        itemSets.length - currentIndex,
-        ...newItemSets
-      );
-      const startOfQueuedStatuses = this.statuses.findIndex(
-        (x) => x.status === TransactionStatus.Queued
-      );
-      this.statuses.splice(
-        startOfQueuedStatuses,
-        this.statuses.length - startOfQueuedStatuses,
-        ...newItemSets.map((x, i) => ({
-          name: x.name(),
-          attemptNum: i === 0 ? attemptNum : 0,
-          status:
-            i === 0 ? TransactionStatus.Processing : TransactionStatus.Queued,
-        }))
-      );
-    }
-
-    return newItemSets;
-  }
-
   protected async sendTransaction(
     tx: TransactionBuilder,
     name: string,
@@ -592,35 +546,45 @@ export class TransactionsManager<T extends TxHandler> {
         txSig: txSig ? bs58.encode(txSig) : undefined,
       });
     } catch (e: any) {
-      this.txHandler.log("Capturing error info...");
-      const errorDetails = getErrorInfo(
-        this.txHandler.umi,
-        [tx],
-        e,
-        this.statuses.find(
-          (x) => x.name === name && x.attemptNum === attemptNum
-        )?.simulationSuccessful,
-        priorityFeeSetting
-      );
+      this.captureErrorInfo([tx], [name], attemptNum, e);
+    }
+  }
 
-      const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
-      const errorInfo =
-        errorDetails.errorName || errorDetails.errorInfo
-          ? errorString
-          : e.message;
-      this.updateStatus({
-        name,
-        status: errorDetails.canBeIgnored
-          ? TransactionStatus.Skipped
-          : TransactionStatus.Failed,
-        attemptNum,
-        moreInfo: errorInfo,
-      });
-      consoleLog(errorString);
+  private captureErrorInfo(
+    transactions: TransactionBuilder[],
+    txNames: string[],
+    attemptNum: number,
+    error: any
+  ) {
+    consoleLog("Capturing error info...");
+    const errorDetails = getErrorInfo(
+      this.txHandler.umi,
+      transactions,
+      error,
+      txNames.filter(
+        (x) =>
+          this.statuses.find((y) => x === y.name && y.attemptNum === attemptNum)
+            ?.simulationSuccessful
+      ).length === txNames.length,
+      this.priorityFeeSetting
+    );
 
-      if (!errorDetails.canBeIgnored) {
-        throw new Error(errorInfo);
-      }
+    const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
+    const errorInfo =
+      errorDetails.errorName || errorDetails.errorInfo
+        ? errorString
+        : error.message;
+    this.updateStatusForSets(txNames, {
+      status: errorDetails.canBeIgnored
+        ? TransactionStatus.Skipped
+        : TransactionStatus.Failed,
+      attemptNum,
+      moreInfo: errorInfo,
+    });
+    consoleLog(errorString);
+
+    if (!errorDetails.canBeIgnored) {
+      throw new Error(errorInfo);
     }
   }
 }

package/tests/unit/accounts.ts

@@ -24,7 +24,6 @@ async function hasTokenAccounts(wallet: PublicKey) {
     )
   );
   for (let i = 0; i < tokenAccounts.length; i++) {
-    console.log(tokenAccounts[i].publicKey.toString());
     if (!tokenAccounts[i].exists) {
       console.log(
         `Missing ${wallet.toString()} TA for `,
@@ -55,7 +54,9 @@ describe("Assert Solauto fee token accounts are created", async () => {
         !ismAccounts.find((x) => group.equals(toWeb3JsPublicKey(x.group)))
     );
 
-    console.log("Missing ISM accounts", missingIsmAccounts);
+    if (missingIsmAccounts.length > 0) {
+      console.log("Missing ISM accounts", missingIsmAccounts);
+    }
     assert(missingIsmAccounts.length === 0);
   });
 });