@haven-fi/solauto-sdk 1.0.478 → 1.0.480

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;AAMzD,OAAO,EAEL,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;AAW7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA0FD,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,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,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,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA4BxB,6BAA6B;YAsI7B,qBAAqB;YAoDrB,eAAe;YAwDf,eAAe;CA4D9B"}
+{"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;AAMzD,OAAO,EAEL,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;AAW7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA0FD,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,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,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,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAkCxB,6BAA6B;YAsI7B,qBAAqB;YAoDrB,eAAe;YA0Df,eAAe;CA4D9B"}

package/dist/transactions/transactionsManager.js

@@ -314,13 +314,20 @@ class TransactionsManager {
     async send(items) {
         this.statuses = [];
         this.lookupTables.reset();
-        if (!items[0].initialized) {
-            for (const item of items) {
-                await item.initialize();
+        const itemSets = await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => {
+            if (!items[0].initialized) {
+                for (const item of items) {
+                    await item.initialize();
+                }
             }
-        }
-        this.txHandler.log("Transaction items:", items.length);
-        const itemSets = await this.assembleTransactionSets(items);
+            else if (attemptNum > 0) {
+                for (const item of items) {
+                    await item.refetch(0);
+                }
+            }
+            this.txHandler.log("Transaction items:", items.length);
+            return await this.assembleTransactionSets(items);
+        }, 2);
         this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
         this.txHandler.log("Initial item sets:", itemSets.length);
         if (this.atomically) {
@@ -421,21 +428,23 @@ class TransactionsManager {
         }, this.totalRetries, this.retryDelay, this.errorsToThrow);
     }
     async refreshItemSets(itemSets, attemptNum, currentIndex) {
-        if (currentIndex !== undefined) {
-            const itemSet = itemSets[currentIndex];
-            await itemSet.refetchAll(attemptNum);
-        }
-        else {
-            for (const itemSet of itemSets) {
+        const newItemSets = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+            if (currentIndex !== undefined) {
+                const itemSet = itemSets[currentIndex];
                 await itemSet.refetchAll(attemptNum);
             }
-        }
-        const newItemSets = await this.assembleTransactionSets(currentIndex !== undefined
-            ? [
-                ...itemSets[currentIndex].items,
-                ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
-            ]
-            : itemSets.flatMap((set) => set.items));
+            else {
+                for (const itemSet of itemSets) {
+                    await itemSet.refetchAll(attemptNum);
+                }
+            }
+            return await this.assembleTransactionSets(currentIndex !== undefined
+                ? [
+                    ...itemSets[currentIndex].items,
+                    ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
+                ]
+                : itemSets.flatMap((set) => set.items));
+        }, 2);
         const newItemSetNames = newItemSets.map((x) => x.name());
         if (newItemSetNames.length === 1 &&
             newItemSetNames[0] === this.updateOracleTxName) {

package/dist/utils/solauto/rebalanceUtils.js

@@ -193,7 +193,7 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
     const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(client, values);
     const flashLoanRepayFromDebt = repaying && requiresFlashLoan && useDebtLiquidity;
     const exactOut = targetLiqUtilizationRateBps === 0 ||
-        values.repayingCloseToMaxLtv ||
+        // values.repayingCloseToMaxLtv ||
         flashLoanRepayFromDebt;
     const exactIn = !exactOut;
     const addPadding = exactOut;

package/package.json

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

@@ -515,14 +515,20 @@ export class TransactionsManager {
     this.statuses = [];
     this.lookupTables.reset();
 
-    if (!items[0].initialized) {
-      for (const item of items) {
-        await item.initialize();
+    const itemSets = await retryWithExponentialBackoff(async (attemptNum) => {
+      if (!items[0].initialized) {
+        for (const item of items) {
+          await item.initialize();
+        }
+      } else if (attemptNum > 0) {
+        for (const item of items) {
+          await item.refetch(0);
+        }
       }
-    }
+      this.txHandler.log("Transaction items:", items.length);
+      return await this.assembleTransactionSets(items);
+    }, 2);
 
-    this.txHandler.log("Transaction items:", items.length);
-    const itemSets = await this.assembleTransactionSets(items);
     this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
     this.txHandler.log("Initial item sets:", itemSets.length);
 
@@ -730,23 +736,25 @@ export class TransactionsManager {
     attemptNum: number,
     currentIndex?: number
   ): Promise<TransactionSet[] | undefined> {
-    if (currentIndex !== undefined) {
-      const itemSet = itemSets[currentIndex];
-      await itemSet.refetchAll(attemptNum);
-    } else {
-      for (const itemSet of itemSets) {
+    const newItemSets = await retryWithExponentialBackoff(async () => {
+      if (currentIndex !== undefined) {
+        const itemSet = itemSets[currentIndex];
         await itemSet.refetchAll(attemptNum);
+      } else {
+        for (const itemSet of itemSets) {
+          await itemSet.refetchAll(attemptNum);
+        }
       }
-    }
 
-    const newItemSets = await this.assembleTransactionSets(
-      currentIndex !== undefined
-        ? [
-            ...itemSets[currentIndex].items,
-            ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
-          ]
-        : itemSets.flatMap((set) => set.items)
-    );
+      return await this.assembleTransactionSets(
+        currentIndex !== undefined
+          ? [
+              ...itemSets[currentIndex].items,
+              ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
+            ]
+          : itemSets.flatMap((set) => set.items)
+      );
+    }, 2);
 
     const newItemSetNames = newItemSets.map((x) => x.name());
     if (

package/src/utils/solauto/rebalanceUtils.ts

@@ -415,7 +415,7 @@ export function getJupSwapRebalanceDetails(
 
   const exactOut =
     targetLiqUtilizationRateBps === 0 ||
-    values.repayingCloseToMaxLtv ||
+    // values.repayingCloseToMaxLtv ||
     flashLoanRepayFromDebt;
   const exactIn = !exactOut;