@haven-fi/solauto-sdk 1.0.739 → 1.0.740

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

@@ -13,14 +13,15 @@ export declare enum TransactionStatus {
     Successful = "Successful",
     Failed = "Failed"
 }
-export type TransactionManagerStatuses = {
+export interface TransactionManagerStatus {
     name: string;
     attemptNum: number;
     status: TransactionStatus;
     moreInfo?: string;
     simulationSuccessful?: boolean;
     txSig?: string;
-}[];
+}
+export type TransactionManagerStatuses = TransactionManagerStatus[];
 interface RetryConfig {
     signableRetries?: number;
     totalRetries?: number;
@@ -58,10 +59,11 @@ export declare class TransactionsManager<T extends TxHandler> {
     private updateStatusForSets;
     send(items: TransactionItem[]): Promise<TransactionManagerStatuses>;
     private shouldProceedToSend;
+    private getTrueAttemptNum;
     private processTransactionsAtomically;
     private processTransactionSet;
     private refreshItemSets;
-    protected sendTransaction(tx: TransactionBuilder, txName: string, attemptNum: number, priorityFeeSetting?: PriorityFeeSetting, txRunType?: TransactionRunType): Promise<void>;
+    protected sendTransaction(tx: TransactionBuilder, name: string, attemptNum: number, priorityFeeSetting?: PriorityFeeSetting, txRunType?: TransactionRunType): Promise<void>;
 }
 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":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,aAAa,EAId,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAEzE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAED,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,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,SAAS;IAC1D,SAAS,EAAE,CAAC,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChE,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,SAAS;IAClD,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAC1E,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAM;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAE5C,kBAAkB,SAAmB;gBAEzB,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC;YAoB9B,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAoBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;IA8BtC,OAAO,CAAC,mBAAmB;YAoBb,6BAA6B;YA2J7B,qBAAqB;YAuDrB,eAAe;cAkDb,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;CA4DjC"}
+{"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

@@ -76,38 +76,27 @@ class TransactionsManager {
         }
         return transactionSets;
     }
-    updateStatus(name, status, attemptNum, txSig, simulationSuccessful, moreInfo) {
-        if (!this.statuses.filter((x) => x.name === name)) {
-            this.statuses.push({
-                name,
-                status,
-                txSig,
-                attemptNum,
-                simulationSuccessful,
-                moreInfo,
-            });
+    updateStatus(args) {
+        if (!this.statuses.filter((x) => x.name === args.name)) {
+            this.statuses.push(args);
         }
         else {
-            const idx = this.statuses.findIndex((x) => x.name === name && x.attemptNum === attemptNum);
+            const idx = this.statuses.findIndex((x) => x.name === args.name && x.attemptNum === args.attemptNum);
             if (idx !== -1) {
-                this.statuses[idx].status = status;
-                this.statuses[idx].txSig = txSig;
-                if (simulationSuccessful) {
-                    this.statuses[idx].simulationSuccessful = simulationSuccessful;
+                this.statuses[idx].status = args.status;
+                this.statuses[idx].txSig = args.txSig;
+                if (args.simulationSuccessful) {
+                    this.statuses[idx].simulationSuccessful = args.simulationSuccessful;
                 }
-                if (moreInfo) {
-                    this.statuses[idx].moreInfo = moreInfo;
+                // else if (status === TransactionStatus.Queued || status === TransactionStatus.Processing) {
+                //   this.statuses[idx].simulationSuccessful = undefined;
+                // }
+                if (args.moreInfo) {
+                    this.statuses[idx].moreInfo = args.moreInfo;
                 }
             }
             else {
-                this.statuses.push({
-                    name,
-                    status,
-                    txSig,
-                    attemptNum,
-                    simulationSuccessful,
-                    moreInfo,
-                });
+                this.statuses.push(args);
             }
         }
         this.txHandler.log(`${name} is ${status.toString().toLowerCase()}`);
@@ -135,9 +124,13 @@ class TransactionsManager {
         }
         return this.priorityFeeSetting;
     }
-    updateStatusForSets(itemSets, status, attemptNum, txSigs, simulationSuccessful, moreInfo) {
+    updateStatusForSets(itemSets, args, txSigs) {
         itemSets.forEach((itemSet, i) => {
-            this.updateStatus(itemSet.name(), status, attemptNum, txSigs !== undefined ? txSigs[i] : undefined, simulationSuccessful, moreInfo);
+            this.updateStatus({
+                name: itemSet.name(),
+                txSig: txSigs && txSigs.length > i ? txSigs[i] : undefined,
+                ...args,
+            });
         });
     }
     async send(items) {
@@ -152,7 +145,10 @@ class TransactionsManager {
             this.txHandler.log("Transaction items:", items.length);
             return await this.assembleTransactionSets(items);
         }, this.totalRetries);
-        this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
+        this.updateStatusForSets(itemSets, {
+            status: TransactionStatus.Queued,
+            attemptNum: 0,
+        });
         this.txHandler.log("Initial item sets:", itemSets.length);
         if (this.atomically) {
             await this.processTransactionsAtomically(itemSets);
@@ -174,23 +170,33 @@ class TransactionsManager {
         if (newItemSetNames.length === 1 &&
             newItemSetNames[0] === this.updateOracleTxName) {
             (0, utils_1.consoleLog)("Skipping unnecessary oracle update");
-            this.updateStatusForSets(itemSets, TransactionStatus.Skipped, attemptNum);
+            this.updateStatusForSets(itemSets, {
+                status: TransactionStatus.Skipped,
+                attemptNum,
+            });
             return false;
         }
         return true;
     }
+    getTrueAttemptNum(itemSetName) {
+        const prevAttempts = this.statuses.filter((x) => x.name === itemSetName);
+        const attemptNum = prevAttempts.length -
+            prevAttempts.filter((x) => x.status === TransactionStatus.Skipped)
+                ?.length;
+        return attemptNum;
+    }
     async processTransactionsAtomically(itemSets) {
-        let num = 0;
+        let attemptNum = 0;
         let transactions = [];
-        await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => {
+        await (0, utils_1.retryWithExponentialBackoff)(async (retryNum, prevError) => {
             if (prevError &&
                 this.statuses.filter((x) => x.simulationSuccessful).length >
                     this.signableRetries) {
                 throw prevError;
             }
-            num = attemptNum;
+            attemptNum = Math.max(...itemSets.map((x) => this.getTrueAttemptNum(x?.name() ?? "")));
             this.priorityFeeSetting = this.getUpdatedPriorityFeeSetting(prevError, attemptNum);
-            if (attemptNum > 0) {
+            if (retryNum > 0) {
                 const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError);
                 if (!refreshedSets || !refreshedSets.length) {
                     return;
@@ -208,17 +214,27 @@ class TransactionsManager {
             }
             transactions = transactions.filter((x) => x.getInstructions().length > 0);
             if (transactions.length === 0) {
-                this.updateStatusForSets(itemSets, TransactionStatus.Skipped, attemptNum);
+                this.updateStatusForSets(itemSets, {
+                    status: TransactionStatus.Skipped,
+                    attemptNum,
+                });
                 return;
             }
-            this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum);
+            this.updateStatusForSets(itemSets, {
+                status: TransactionStatus.Processing,
+                attemptNum,
+            });
             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, TransactionStatus.Processing, attemptNum, undefined, true), this.abortController);
+                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;
@@ -227,20 +243,28 @@ class TransactionsManager {
                 (this.txRunType !== "only-simulate" &&
                     (!Boolean(txSigs) || txSigs?.length === 0) &&
                     !this.abortController?.signal.aborted)) {
-                this.updateStatusForSets(itemSets, TransactionStatus.Failed, attemptNum, txSigs, undefined, error?.message);
+                this.updateStatusForSets(itemSets, {
+                    status: TransactionStatus.Failed,
+                    attemptNum,
+                    moreInfo: error?.message,
+                }, txSigs);
                 throw error ? error : new Error("Unknown error");
             }
-            this.updateStatusForSets(itemSets, TransactionStatus.Successful, attemptNum, txSigs);
+            this.updateStatusForSets(itemSets, { status: TransactionStatus.Successful, attemptNum }, txSigs);
         }, this.totalRetries, this.retryDelay, this.errorsToThrow).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 === num)?.simulationSuccessful).length === itemSets.length, this.priorityFeeSetting);
+            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, errorDetails.canBeIgnored
-                ? TransactionStatus.Skipped
-                : TransactionStatus.Failed, num, undefined, undefined, errorInfo);
+            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);
@@ -249,13 +273,14 @@ class TransactionsManager {
     }
     async processTransactionSet(itemSets, currentIndex) {
         let itemSet = itemSets[currentIndex];
-        await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => {
+        await (0, utils_1.retryWithExponentialBackoff)(async (retryNum, prevError) => {
             if (prevError &&
                 this.statuses.filter((x) => x.simulationSuccessful).length >
                     this.signableRetries) {
                 throw prevError;
             }
-            if (currentIndex > 0 || attemptNum > 0) {
+            const attemptNum = this.getTrueAttemptNum(itemSet?.name() ?? "");
+            if (currentIndex > 0 || retryNum > 0) {
                 const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError, currentIndex);
                 itemSet = refreshedSets ? refreshedSets[0] : undefined;
             }
@@ -264,7 +289,11 @@ class TransactionsManager {
             }
             const tx = await itemSet.getSingleTransaction();
             if (tx.getInstructions().length === 0) {
-                this.updateStatus(itemSet.name(), TransactionStatus.Skipped, attemptNum);
+                this.updateStatus({
+                    name: itemSet.name(),
+                    status: TransactionStatus.Skipped,
+                    attemptNum,
+                });
             }
             else {
                 await this.debugAccounts(itemSet, tx);
@@ -302,22 +331,41 @@ class TransactionsManager {
         }
         return newItemSets;
     }
-    async sendTransaction(tx, txName, attemptNum, priorityFeeSetting, txRunType) {
-        this.updateStatus(txName, TransactionStatus.Processing, attemptNum);
+    async sendTransaction(tx, name, attemptNum, priorityFeeSetting, txRunType) {
+        this.updateStatus({
+            name,
+            status: TransactionStatus.Processing,
+            attemptNum,
+        });
         try {
-            const txSig = await (0, utils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, txRunType ?? this.txRunType, priorityFeeSetting, () => this.updateStatus(txName, TransactionStatus.Processing, attemptNum, undefined, true), this.abortController);
-            this.updateStatus(txName, TransactionStatus.Successful, attemptNum, txSig ? bs58_1.default.encode(txSig) : undefined);
+            const txSig = await (0, utils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, txRunType ?? this.txRunType, priorityFeeSetting, () => this.updateStatus({
+                name,
+                status: TransactionStatus.Processing,
+                attemptNum,
+                simulationSuccessful: true,
+            }), this.abortController);
+            this.updateStatus({
+                name,
+                status: TransactionStatus.Successful,
+                attemptNum,
+                txSig: txSig ? bs58_1.default.encode(txSig) : undefined,
+            });
         }
         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 === txName && x.attemptNum === attemptNum)?.simulationSuccessful, priorityFeeSetting);
+            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(txName, errorDetails.canBeIgnored
-                ? TransactionStatus.Skipped
-                : TransactionStatus.Failed, attemptNum, undefined, undefined, errorInfo);
+            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);

package/local/txSandbox.ts

@@ -47,14 +47,14 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 2,
-    authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
+    positionId: 1,
+    authority: new PublicKey("Bk6mdg4mg9BD217vZwk8WDv7YJ66VyPPRhhQpaZsQPfL"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
-  const transactionItems = [rebalance(client)];
+  const transactionItems = [rebalance(client, undefined, 25)];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,

package/package.json

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

@@ -33,14 +33,16 @@ export enum TransactionStatus {
   Failed = "Failed",
 }
 
-export type TransactionManagerStatuses = {
+export interface TransactionManagerStatus {
   name: string;
   attemptNum: number;
   status: TransactionStatus;
   moreInfo?: string;
   simulationSuccessful?: boolean;
   txSig?: string;
-}[];
+}
+
+export type TransactionManagerStatuses = TransactionManagerStatus[];
 
 interface RetryConfig {
   signableRetries?: number;
@@ -137,45 +139,27 @@ export class TransactionsManager<T extends TxHandler> {
     return transactionSets;
   }
 
-  private updateStatus(
-    name: string,
-    status: TransactionStatus,
-    attemptNum: number,
-    txSig?: string,
-    simulationSuccessful?: boolean,
-    moreInfo?: string
-  ) {
-    if (!this.statuses.filter((x) => x.name === name)) {
-      this.statuses.push({
-        name,
-        status,
-        txSig,
-        attemptNum,
-        simulationSuccessful,
-        moreInfo,
-      });
+  private updateStatus(args: TransactionManagerStatus) {
+    if (!this.statuses.filter((x) => x.name === args.name)) {
+      this.statuses.push(args);
     } else {
       const idx = this.statuses.findIndex(
-        (x) => x.name === name && x.attemptNum === attemptNum
+        (x) => x.name === args.name && x.attemptNum === args.attemptNum
       );
       if (idx !== -1) {
-        this.statuses[idx].status = status;
-        this.statuses[idx].txSig = txSig;
-        if (simulationSuccessful) {
-          this.statuses[idx].simulationSuccessful = simulationSuccessful;
+        this.statuses[idx].status = args.status;
+        this.statuses[idx].txSig = args.txSig;
+        if (args.simulationSuccessful) {
+          this.statuses[idx].simulationSuccessful = args.simulationSuccessful;
         }
-        if (moreInfo) {
-          this.statuses[idx].moreInfo = moreInfo;
+        // else if (status === TransactionStatus.Queued || status === TransactionStatus.Processing) {
+        //   this.statuses[idx].simulationSuccessful = undefined;
+        // }
+        if (args.moreInfo) {
+          this.statuses[idx].moreInfo = args.moreInfo;
         }
       } else {
-        this.statuses.push({
-          name,
-          status,
-          txSig,
-          attemptNum,
-          simulationSuccessful,
-          moreInfo,
-        });
+        this.statuses.push(args);
       }
     }
     this.txHandler.log(`${name} is ${status.toString().toLowerCase()}`);
@@ -220,21 +204,15 @@ export class TransactionsManager<T extends TxHandler> {
 
   private updateStatusForSets(
     itemSets: TransactionSet[],
-    status: TransactionStatus,
-    attemptNum: number,
-    txSigs?: string[],
-    simulationSuccessful?: boolean,
-    moreInfo?: string
+    args: Omit<TransactionManagerStatus, "name">,
+    txSigs?: string[]
   ) {
     itemSets.forEach((itemSet, i) => {
-      this.updateStatus(
-        itemSet.name(),
-        status,
-        attemptNum,
-        txSigs !== undefined ? txSigs[i] : undefined,
-        simulationSuccessful,
-        moreInfo
-      );
+      this.updateStatus({
+        name: itemSet.name(),
+        txSig: txSigs && txSigs.length > i ? txSigs[i] : undefined,
+        ...args,
+      });
     });
   }
 
@@ -254,7 +232,10 @@ export class TransactionsManager<T extends TxHandler> {
       return await this.assembleTransactionSets(items);
     }, this.totalRetries);
 
-    this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
+    this.updateStatusForSets(itemSets, {
+      status: TransactionStatus.Queued,
+      attemptNum: 0,
+    });
     this.txHandler.log("Initial item sets:", itemSets.length);
 
     if (this.atomically) {
@@ -283,19 +264,31 @@ export class TransactionsManager<T extends TxHandler> {
       newItemSetNames[0] === this.updateOracleTxName
     ) {
       consoleLog("Skipping unnecessary oracle update");
-      this.updateStatusForSets(itemSets, TransactionStatus.Skipped, attemptNum);
+      this.updateStatusForSets(itemSets, {
+        status: TransactionStatus.Skipped,
+        attemptNum,
+      });
       return false;
     }
 
     return true;
   }
 
+  private getTrueAttemptNum(itemSetName: string) {
+    const prevAttempts = this.statuses.filter((x) => x.name === itemSetName);
+    const attemptNum =
+      prevAttempts.length -
+      prevAttempts.filter((x) => x.status === TransactionStatus.Skipped)
+        ?.length;
+    return attemptNum;
+  }
+
   private async processTransactionsAtomically(itemSets: TransactionSet[]) {
-    let num = 0;
+    let attemptNum = 0;
     let transactions: TransactionBuilder[] = [];
 
     await retryWithExponentialBackoff(
-      async (attemptNum, prevError) => {
+      async (retryNum, prevError) => {
         if (
           prevError &&
           this.statuses.filter((x) => x.simulationSuccessful).length >
@@ -304,13 +297,16 @@ export class TransactionsManager<T extends TxHandler> {
           throw prevError;
         }
 
-        num = attemptNum;
+        attemptNum = Math.max(
+          ...itemSets.map((x) => this.getTrueAttemptNum(x?.name() ?? ""))
+        );
+
         this.priorityFeeSetting = this.getUpdatedPriorityFeeSetting(
           prevError,
           attemptNum
         );
 
-        if (attemptNum > 0) {
+        if (retryNum > 0) {
           const refreshedSets = await this.refreshItemSets(
             itemSets,
             attemptNum,
@@ -335,19 +331,17 @@ export class TransactionsManager<T extends TxHandler> {
           (x) => x.getInstructions().length > 0
         );
         if (transactions.length === 0) {
-          this.updateStatusForSets(
-            itemSets,
-            TransactionStatus.Skipped,
-            attemptNum
-          );
+          this.updateStatusForSets(itemSets, {
+            status: TransactionStatus.Skipped,
+            attemptNum,
+          });
           return;
         }
 
-        this.updateStatusForSets(
-          itemSets,
-          TransactionStatus.Processing,
-          attemptNum
-        );
+        this.updateStatusForSets(itemSets, {
+          status: TransactionStatus.Processing,
+          attemptNum,
+        });
         for (const itemSet of itemSets) {
           await this.debugAccounts(
             itemSet,
@@ -367,13 +361,11 @@ export class TransactionsManager<T extends TxHandler> {
             this.txRunType,
             this.priorityFeeSetting,
             () =>
-              this.updateStatusForSets(
-                itemSets,
-                TransactionStatus.Processing,
+              this.updateStatusForSets(itemSets, {
+                status: TransactionStatus.Processing,
                 attemptNum,
-                undefined,
-                true
-              ),
+                simulationSuccessful: true,
+              }),
             this.abortController
           );
         } catch (e: any) {
@@ -388,19 +380,19 @@ export class TransactionsManager<T extends TxHandler> {
         ) {
           this.updateStatusForSets(
             itemSets,
-            TransactionStatus.Failed,
-            attemptNum,
-            txSigs,
-            undefined,
-            error?.message
+            {
+              status: TransactionStatus.Failed,
+              attemptNum,
+              moreInfo: error?.message,
+            },
+            txSigs
           );
           throw error ? error : new Error("Unknown error");
         }
 
         this.updateStatusForSets(
           itemSets,
-          TransactionStatus.Successful,
-          attemptNum,
+          { status: TransactionStatus.Successful, attemptNum },
           txSigs
         );
       },
@@ -416,7 +408,7 @@ export class TransactionsManager<T extends TxHandler> {
         itemSets.filter(
           (x) =>
             this.statuses.find(
-              (y) => x.name() === y.name && y.attemptNum === num
+              (y) => x.name() === y.name && y.attemptNum === attemptNum
             )?.simulationSuccessful
         ).length === itemSets.length,
         this.priorityFeeSetting
@@ -427,16 +419,13 @@ export class TransactionsManager<T extends TxHandler> {
         errorDetails.errorName || errorDetails.errorInfo
           ? errorString
           : e.message;
-      this.updateStatusForSets(
-        itemSets,
-        errorDetails.canBeIgnored
+      this.updateStatusForSets(itemSets, {
+        status: errorDetails.canBeIgnored
           ? TransactionStatus.Skipped
           : TransactionStatus.Failed,
-        num,
-        undefined,
-        undefined,
-        errorInfo
-      );
+        attemptNum,
+        moreInfo: errorInfo,
+      });
       consoleLog(errorString);
 
       if (!errorDetails.canBeIgnored) {
@@ -451,7 +440,7 @@ export class TransactionsManager<T extends TxHandler> {
   ) {
     let itemSet: TransactionSet | undefined = itemSets[currentIndex];
     await retryWithExponentialBackoff(
-      async (attemptNum, prevError) => {
+      async (retryNum, prevError) => {
         if (
           prevError &&
           this.statuses.filter((x) => x.simulationSuccessful).length >
@@ -460,7 +449,8 @@ export class TransactionsManager<T extends TxHandler> {
           throw prevError;
         }
 
-        if (currentIndex > 0 || attemptNum > 0) {
+        const attemptNum = this.getTrueAttemptNum(itemSet?.name() ?? "");
+        if (currentIndex > 0 || retryNum > 0) {
           const refreshedSets = await this.refreshItemSets(
             itemSets,
             attemptNum,
@@ -475,11 +465,11 @@ export class TransactionsManager<T extends TxHandler> {
 
         const tx = await itemSet.getSingleTransaction();
         if (tx.getInstructions().length === 0) {
-          this.updateStatus(
-            itemSet.name(),
-            TransactionStatus.Skipped,
-            attemptNum
-          );
+          this.updateStatus({
+            name: itemSet.name(),
+            status: TransactionStatus.Skipped,
+            attemptNum,
+          });
         } else {
           await this.debugAccounts(itemSet, tx);
           this.priorityFeeSetting = this.getUpdatedPriorityFeeSetting(
@@ -552,12 +542,16 @@ export class TransactionsManager<T extends TxHandler> {
 
   protected async sendTransaction(
     tx: TransactionBuilder,
-    txName: string,
+    name: string,
     attemptNum: number,
     priorityFeeSetting?: PriorityFeeSetting,
     txRunType?: TransactionRunType
   ) {
-    this.updateStatus(txName, TransactionStatus.Processing, attemptNum);
+    this.updateStatus({
+      name,
+      status: TransactionStatus.Processing,
+      attemptNum,
+    });
     try {
       const txSig = await sendSingleOptimizedTransaction(
         this.txHandler.umi,
@@ -566,21 +560,20 @@ export class TransactionsManager<T extends TxHandler> {
         txRunType ?? this.txRunType,
         priorityFeeSetting,
         () =>
-          this.updateStatus(
-            txName,
-            TransactionStatus.Processing,
+          this.updateStatus({
+            name,
+            status: TransactionStatus.Processing,
             attemptNum,
-            undefined,
-            true
-          ),
+            simulationSuccessful: true,
+          }),
         this.abortController
       );
-      this.updateStatus(
-        txName,
-        TransactionStatus.Successful,
+      this.updateStatus({
+        name,
+        status: TransactionStatus.Successful,
         attemptNum,
-        txSig ? bs58.encode(txSig) : undefined
-      );
+        txSig: txSig ? bs58.encode(txSig) : undefined,
+      });
     } catch (e: any) {
       this.txHandler.log("Capturing error info...");
       const errorDetails = getErrorInfo(
@@ -588,7 +581,7 @@ export class TransactionsManager<T extends TxHandler> {
         [tx],
         e,
         this.statuses.find(
-          (x) => x.name === txName && x.attemptNum === attemptNum
+          (x) => x.name === name && x.attemptNum === attemptNum
         )?.simulationSuccessful,
         priorityFeeSetting
       );
@@ -598,16 +591,14 @@ export class TransactionsManager<T extends TxHandler> {
         errorDetails.errorName || errorDetails.errorInfo
           ? errorString
           : e.message;
-      this.updateStatus(
-        txName,
-        errorDetails.canBeIgnored
+      this.updateStatus({
+        name,
+        status: errorDetails.canBeIgnored
           ? TransactionStatus.Skipped
           : TransactionStatus.Failed,
         attemptNum,
-        undefined,
-        undefined,
-        errorInfo
-      );
+        moreInfo: errorInfo,
+      });
       consoleLog(errorString);
 
       if (!errorDetails.canBeIgnored) {