@haven-fi/solauto-sdk 1.0.239 → 1.0.240

package/dist/transactions/transactionsManager.d.ts

@@ -46,8 +46,11 @@ export declare class TransactionsManager {
     private updateStatus;
     private debugAccounts;
     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,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;IAUvB,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;YA6FxB,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

@@ -231,6 +231,11 @@ class TransactionsManager {
         }
         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;
@@ -281,56 +286,54 @@ 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 [];
         }
-        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, prevError) => {
-                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, this.getUpdatedPriorityFeeSetting(prevError));
-                }
-            }, this.retries, this.retryDelay, this.errorsToThrow);
+        let currentIndex = 0;
+        while (currentIndex < itemSets.length) {
+            await this.processTransactionSet(itemSets, currentIndex);
+            currentIndex++;
         }
         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 newItemSets[0];
+    }
     async sendTransaction(tx, txName, attemptNum, priorityFeeSetting) {
         this.updateStatus(txName, TransactionStatus.Processing, attemptNum);
         try {

package/package.json

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

@@ -333,6 +333,12 @@ export class TransactionsManager {
     return this.priorityFeeSetting;
   }
 
+  private updateStatusForSets(itemSets: TransactionSet[]) {
+    itemSets.forEach((itemSet) => {
+      this.updateStatus(itemSet.name(), TransactionStatus.Queued, 0);
+    });
+  }
+
   public async clientSend(
     transactions: TransactionItem[]
   ): Promise<TransactionManagerStatuses> {
@@ -422,10 +428,7 @@ 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.txType === "only-simulate" && itemSets.length > 1) {
       this.txHandler.log(
@@ -434,74 +437,83 @@ export class TransactionsManager {
       return [];
     }
 
-    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,
-            }))
+    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
           );
-          this.txHandler.log(this.statuses);
-          itemSets.splice(
-            i + 1,
-            itemSets.length - i - 1,
-            ...newItemSets.slice(1)
+        }
+        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)
           );
         }
-        return newItemSets.length > 0 ? newItemSets[0] : undefined;
-      };
+      },
+      this.retries,
+      this.retryDelay,
+      this.errorsToThrow
+    ).catch((e) => {
+      if (itemSet) {
+        this.updateStatus(
+          itemSet.name(),
+          TransactionStatus.Failed,
+          this.retries,
+        );
+      }
+      throw e;
+    });
+  }
 
-      let itemSet: TransactionSet | undefined = itemSets[i];
-      await retryWithExponentialBackoff(
-        async (attemptNum, prevError) => {
-          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,
-              this.getUpdatedPriorityFeeSetting(prevError)
-            );
-          }
-        },
-        this.retries,
-        this.retryDelay,
-        this.errorsToThrow
-      );
+  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 this.statuses;
+  
+    return newItemSets[0];
   }
 
   private async sendTransaction(

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);
   });
 });