@haven-fi/solauto-sdk 1.0.740 → 1.0.742

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

@@ -76,7 +76,7 @@ class TransactionsManager {
         }
         return transactionSets;
     }
-    updateStatus(args) {
+    updateStatus(args, reset) {
         if (!this.statuses.filter((x) => x.name === args.name)) {
             this.statuses.push(args);
         }
@@ -88,18 +88,20 @@ class TransactionsManager {
                 if (args.simulationSuccessful) {
                     this.statuses[idx].simulationSuccessful = args.simulationSuccessful;
                 }
-                // else if (status === TransactionStatus.Queued || status === TransactionStatus.Processing) {
-                //   this.statuses[idx].simulationSuccessful = undefined;
-                // }
                 if (args.moreInfo) {
                     this.statuses[idx].moreInfo = args.moreInfo;
                 }
+                if (reset) {
+                    this.statuses[idx].txSig = undefined;
+                    this.statuses[idx].simulationSuccessful = undefined;
+                    this.statuses[idx].moreInfo = undefined;
+                }
             }
             else {
                 this.statuses.push(args);
             }
         }
-        this.txHandler.log(`${name} is ${status.toString().toLowerCase()}`);
+        this.txHandler.log(`${args.name} ${args.attemptNum} is ${args.status.toString().toLowerCase()}`);
         this.statusCallback?.([...this.statuses]);
     }
     async debugAccounts(itemSet, tx) {
@@ -124,13 +126,13 @@ class TransactionsManager {
         }
         return this.priorityFeeSetting;
     }
-    updateStatusForSets(itemSets, args, txSigs) {
+    updateStatusForSets(itemSets, args, txSigs, reset) {
         itemSets.forEach((itemSet, i) => {
             this.updateStatus({
                 name: itemSet.name(),
                 txSig: txSigs && txSigs.length > i ? txSigs[i] : undefined,
                 ...args,
-            });
+            }, reset);
         });
     }
     async send(items) {
@@ -179,7 +181,7 @@ class TransactionsManager {
         return true;
     }
     getTrueAttemptNum(itemSetName) {
-        const prevAttempts = this.statuses.filter((x) => x.name === 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;
@@ -223,7 +225,7 @@ class TransactionsManager {
             this.updateStatusForSets(itemSets, {
                 status: TransactionStatus.Processing,
                 attemptNum,
-            });
+            }, undefined, true);
             for (const itemSet of itemSets) {
                 await this.debugAccounts(itemSet, await itemSet.getSingleTransaction());
             }
@@ -336,7 +338,7 @@ class TransactionsManager {
             name,
             status: TransactionStatus.Processing,
             attemptNum,
-        });
+        }, true);
         try {
             const txSig = await (0, utils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, txRunType ?? this.txRunType, priorityFeeSetting, () => this.updateStatus({
                 name,

package/local/txSandbox.ts

@@ -54,13 +54,13 @@ export async function main() {
     // ),
   });
 
-  const transactionItems = [rebalance(client, undefined, 25)];
+  const transactionItems = [rebalance(client, undefined, 350)];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,
     txRunType: payForTransaction ? "normal" : "only-simulate",
     priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 2 },
+    retryConfig: { totalRetries: 4 },
   });
   const statuses = await txManager.send(transactionItems);
   consoleLog(statuses);

package/package.json

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

@@ -139,7 +139,7 @@ export class TransactionsManager<T extends TxHandler> {
     return transactionSets;
   }
 
-  private updateStatus(args: TransactionManagerStatus) {
+  private updateStatus(args: TransactionManagerStatus, reset?: boolean) {
     if (!this.statuses.filter((x) => x.name === args.name)) {
       this.statuses.push(args);
     } else {
@@ -152,17 +152,21 @@ export class TransactionsManager<T extends TxHandler> {
         if (args.simulationSuccessful) {
           this.statuses[idx].simulationSuccessful = args.simulationSuccessful;
         }
-        // else if (status === TransactionStatus.Queued || status === TransactionStatus.Processing) {
-        //   this.statuses[idx].simulationSuccessful = undefined;
-        // }
         if (args.moreInfo) {
           this.statuses[idx].moreInfo = args.moreInfo;
         }
+        if (reset) {
+          this.statuses[idx].txSig = undefined;
+          this.statuses[idx].simulationSuccessful = undefined;
+          this.statuses[idx].moreInfo = undefined;
+        }
       } else {
         this.statuses.push(args);
       }
     }
-    this.txHandler.log(`${name} is ${status.toString().toLowerCase()}`);
+    this.txHandler.log(
+      `${args.name} ${args.attemptNum} is ${args.status.toString().toLowerCase()}`
+    );
     this.statusCallback?.([...this.statuses]);
   }
 
@@ -205,14 +209,18 @@ export class TransactionsManager<T extends TxHandler> {
   private updateStatusForSets(
     itemSets: TransactionSet[],
     args: Omit<TransactionManagerStatus, "name">,
-    txSigs?: string[]
+    txSigs?: string[],
+    reset?: boolean
   ) {
     itemSets.forEach((itemSet, i) => {
-      this.updateStatus({
-        name: itemSet.name(),
-        txSig: txSigs && txSigs.length > i ? txSigs[i] : undefined,
-        ...args,
-      });
+      this.updateStatus(
+        {
+          name: itemSet.name(),
+          txSig: txSigs && txSigs.length > i ? txSigs[i] : undefined,
+          ...args,
+        },
+        reset
+      );
     });
   }
 
@@ -275,7 +283,9 @@ export class TransactionsManager<T extends TxHandler> {
   }
 
   private getTrueAttemptNum(itemSetName: string) {
-    const prevAttempts = this.statuses.filter((x) => x.name === 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)
@@ -338,10 +348,15 @@ export class TransactionsManager<T extends TxHandler> {
           return;
         }
 
-        this.updateStatusForSets(itemSets, {
-          status: TransactionStatus.Processing,
-          attemptNum,
-        });
+        this.updateStatusForSets(
+          itemSets,
+          {
+            status: TransactionStatus.Processing,
+            attemptNum,
+          },
+          undefined,
+          true
+        );
         for (const itemSet of itemSets) {
           await this.debugAccounts(
             itemSet,
@@ -547,11 +562,14 @@ export class TransactionsManager<T extends TxHandler> {
     priorityFeeSetting?: PriorityFeeSetting,
     txRunType?: TransactionRunType
   ) {
-    this.updateStatus({
-      name,
-      status: TransactionStatus.Processing,
-      attemptNum,
-    });
+    this.updateStatus(
+      {
+        name,
+        status: TransactionStatus.Processing,
+        attemptNum,
+      },
+      true
+    );
     try {
       const txSig = await sendSingleOptimizedTransaction(
         this.txHandler.umi,