@haven-fi/solauto-sdk 1.0.832 → 1.0.833

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

@@ -60,6 +60,7 @@ export declare class TransactionsManager<T extends TxHandler> {
     private shouldProceedToSend;
     private refreshItemSets;
     private processTransactionsAtomically;
+    private processTransactionSetsSequentially;
     private sendJitoBundle;
     private processTransactionSet;
     protected sendTransaction(tx: TransactionBuilder, name: string, attemptNum: number, priorityFeeSetting?: PriorityFeeSetting, txRunType?: TransactionRunType): Promise<void>;

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

@@ -161,11 +161,7 @@ class TransactionsManager {
             await this.processTransactionsAtomically(itemSets);
         }
         else {
-            let currentIndex = 0;
-            while (currentIndex < itemSets.length) {
-                await this.processTransactionSet(itemSets, currentIndex);
-                currentIndex++;
-            }
+            await this.processTransactionSetsSequentially(itemSets);
         }
         return this.statuses;
     }
@@ -215,27 +211,49 @@ class TransactionsManager {
         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;
+        let bundleSendAttempted = false;
+        try {
+            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;
+                    }
                 }
-                else {
-                    itemSets = refreshedSets;
+                if (!this.shouldProceedToSend(itemSets, attemptNum)) {
+                    return;
                 }
+                bundleSendAttempted = true;
+                await this.sendJitoBundle(itemSets, attemptNum);
+            }, this.totalRetries, this.retryDelay, this.errorsToThrow);
+        }
+        catch (error) {
+            const explicitlyNonRetryable = this.errorsToThrow?.some((errorType) => error instanceof errorType);
+            if (!bundleSendAttempted ||
+                itemSets.length <= 1 ||
+                explicitlyNonRetryable ||
+                this.abortController?.signal.aborted) {
+                throw error;
             }
-            if (!this.shouldProceedToSend(itemSets, attemptNum)) {
-                return;
-            }
-            await this.sendJitoBundle(itemSets, attemptNum);
-        }, this.totalRetries, this.retryDelay, this.errorsToThrow);
+            (0, utils_1.consoleLog)("Jito bundle failed after all retries; retrying one transaction at a time");
+            await this.processTransactionSetsSequentially(itemSets);
+        }
+    }
+    async processTransactionSetsSequentially(itemSets) {
+        let currentIndex = 0;
+        while (currentIndex < itemSets.length) {
+            await this.processTransactionSet(itemSets, currentIndex);
+            currentIndex++;
+        }
     }
     async sendJitoBundle(itemSets, attemptNum) {
         let transactions = [];

package/package.json

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

@@ -279,11 +279,7 @@ export class TransactionsManager<T extends TxHandler> {
     if (this.atomically) {
       await this.processTransactionsAtomically(itemSets);
     } else {
-      let currentIndex = 0;
-      while (currentIndex < itemSets.length) {
-        await this.processTransactionSet(itemSets, currentIndex);
-        currentIndex++;
-      }
+      await this.processTransactionSetsSequentially(itemSets);
     }
 
     return this.statuses;
@@ -366,44 +362,75 @@ export class TransactionsManager<T extends TxHandler> {
   }
 
   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
-        );
+    let bundleSendAttempted = false;
+    try {
+      await retryWithExponentialBackoff(
+        async (attemptNum, prevError) => {
+          if (
+            prevError &&
+            this.statuses.filter((x) => x.simulationSuccessful).length >
+              this.signableRetries
+          ) {
+            throw prevError;
+          }
 
-        if (attemptNum > 0) {
-          const refreshedSets = await this.refreshItemSets(
-            itemSets,
-            attemptNum,
-            prevError
+          this.priorityFeeSetting = this.getUpdatedPriorityFeeSetting(
+            prevError,
+            attemptNum
           );
-          if (!refreshedSets || !refreshedSets.length) {
+
+          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;
-          } else {
-            itemSets = refreshedSets;
           }
-        }
 
-        if (!this.shouldProceedToSend(itemSets, attemptNum)) {
-          return;
-        }
+          bundleSendAttempted = true;
+          await this.sendJitoBundle(itemSets, attemptNum);
+        },
+        this.totalRetries,
+        this.retryDelay,
+        this.errorsToThrow
+      );
+    } catch (error: any) {
+      const explicitlyNonRetryable = this.errorsToThrow?.some(
+        (errorType) => error instanceof errorType
+      );
+      if (
+        !bundleSendAttempted ||
+        itemSets.length <= 1 ||
+        explicitlyNonRetryable ||
+        this.abortController?.signal.aborted
+      ) {
+        throw error;
+      }
 
-        await this.sendJitoBundle(itemSets, attemptNum);
-      },
-      this.totalRetries,
-      this.retryDelay,
-      this.errorsToThrow
-    );
+      consoleLog(
+        "Jito bundle failed after all retries; retrying one transaction at a time"
+      );
+      await this.processTransactionSetsSequentially(itemSets);
+    }
+  }
+
+  private async processTransactionSetsSequentially(
+    itemSets: TransactionSet[]
+  ) {
+    let currentIndex = 0;
+    while (currentIndex < itemSets.length) {
+      await this.processTransactionSet(itemSets, currentIndex);
+      currentIndex++;
+    }
   }
 
   private async sendJitoBundle(itemSets: TransactionSet[], attemptNum: number) {

package/tests/unit/transactionsManager.ts

@@ -0,0 +1,69 @@
+import { expect } from "chai";
+import { describe, it } from "mocha";
+import { TransactionsManager } from "../../src";
+
+function createManager(abortController?: AbortController) {
+  return new TransactionsManager({
+    txHandler: {
+      defaultLookupTables: () => [],
+      umi: {},
+    } as any,
+    retryConfig: { totalRetries: 1, retryDelay: 0 },
+    abortController,
+  }) as any;
+}
+
+describe("TransactionsManager bundle fallback", () => {
+  it("retries a failed multi-transaction bundle sequentially", async () => {
+    const manager = createManager();
+    const calls: string[] = [];
+    const itemSets = [{}, {}, {}] as any[];
+
+    manager.shouldProceedToSend = () => true;
+    manager.sendJitoBundle = async () => {
+      calls.push("bundle");
+      throw new Error("bundle failed");
+    };
+    manager.processTransactionSet = async (
+      receivedSets: any[],
+      currentIndex: number
+    ) => {
+      expect(receivedSets).to.equal(itemSets);
+      calls.push(`single:${currentIndex}`);
+    };
+
+    await manager.processTransactionsAtomically(itemSets);
+
+    expect(calls).to.deep.equal([
+      "bundle",
+      "single:0",
+      "single:1",
+      "single:2",
+    ]);
+  });
+
+  it("does not fall back after the request is aborted", async () => {
+    const abortController = new AbortController();
+    const manager = createManager(abortController);
+    let sequentialAttempts = 0;
+
+    manager.shouldProceedToSend = () => true;
+    manager.sendJitoBundle = async () => {
+      abortController.abort();
+      throw new Error("bundle aborted");
+    };
+    manager.processTransactionSet = async () => {
+      sequentialAttempts++;
+    };
+
+    let thrownError: Error | undefined;
+    try {
+      await manager.processTransactionsAtomically([{}, {}]);
+    } catch (error: any) {
+      thrownError = error;
+    }
+
+    expect(thrownError?.message).to.equal("bundle aborted");
+    expect(sequentialAttempts).to.equal(0);
+  });
+});