@haven-fi/solauto-sdk 1.0.682 → 1.0.684

package/dist/services/rebalance/rebalanceTxBuilder.d.ts

@@ -3,13 +3,13 @@ import { TransactionItemInputs } from "../../types";
 export declare class RebalanceTxBuilder {
     private client;
     private targetLiqUtilizationRateBps?;
+    private optimizeSize?;
     private values;
     private rebalanceType;
     private swapManager;
     private flRequirements?;
     private priceType;
-    private flFeeBps?;
-    constructor(client: SolautoClient, targetLiqUtilizationRateBps?: number | undefined);
+    constructor(client: SolautoClient, targetLiqUtilizationRateBps?: number | undefined, optimizeSize?: boolean | undefined);
     private shouldProceedWithRebalance;
     private getRebalanceValues;
     private getFlLiquiditySource;

package/dist/services/rebalance/rebalanceTxBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAgCrB,qBAAa,kBAAkB;IAS3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IATtC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,QAAQ,CAAC,CAAS;gBAGhB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IA2C5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA2CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAwBnB,sBAAsB;YAyBtB,mBAAmB;IAmEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}
+{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AA8BrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IATvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,YAAY,CAAC,EAAE,OAAO,YAAA;IAGhC,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IA2C5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA2CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAwBnB,sBAAsB;YAyBtB,mBAAmB;IAmEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -10,9 +10,10 @@ const rebalanceValues_1 = require("./rebalanceValues");
 const solautoFees_1 = require("./solautoFees");
 const rebalanceSwapManager_1 = require("./rebalanceSwapManager");
 class RebalanceTxBuilder {
-    constructor(client, targetLiqUtilizationRateBps) {
+    constructor(client, targetLiqUtilizationRateBps, optimizeSize) {
         this.client = client;
         this.targetLiqUtilizationRateBps = targetLiqUtilizationRateBps;
+        this.optimizeSize = optimizeSize;
         this.priceType = generated_1.PriceType.Realtime;
     }
     shouldProceedWithRebalance() {
@@ -64,14 +65,14 @@ class RebalanceTxBuilder {
         });
         return intermediaryLiqUtilizationRateBps;
     }
-    async flashLoanRequirements(attemptNum) {
+    async flashLoanRequirements() {
         const intermediaryLiqUtilizationRateBps = this.intermediaryLiqUtilizationRateBps();
-        const maxLtvRateBps = (0, utils_1.getMaxLiqUtilizationRateBps)(this.client.pos.state.maxLtvBps, this.client.pos.state.liqThresholdBps, 0.01);
+        const maxLtvRateBps = (0, utils_1.getMaxLiqUtilizationRateBps)(this.client.pos.state.maxLtvBps, this.client.pos.state.liqThresholdBps, 0.015);
         if (intermediaryLiqUtilizationRateBps < maxLtvRateBps) {
             return undefined;
         }
         const stdFlLiquiditySource = this.getFlLiquiditySource(this.client.flProvider.liquidityAvailable(generated_1.TokenType.Supply), this.client.flProvider.liquidityAvailable(generated_1.TokenType.Debt));
-        if ((attemptNum ?? 0) >= 3 || stdFlLiquiditySource === undefined) {
+        if (stdFlLiquiditySource === undefined || this.optimizeSize) {
             (0, utils_1.consoleLog)("Checking signer liquidity");
             const { supplyBalance, debtBalance } = await this.client.signerBalances();
             const signerFlLiquiditySource = this.getFlLiquiditySource(supplyBalance, debtBalance);
@@ -158,7 +159,7 @@ class RebalanceTxBuilder {
             return false;
         }
         this.values = rebalanceValues;
-        this.flRequirements = await this.flashLoanRequirements(attemptNum);
+        this.flRequirements = await this.flashLoanRequirements();
         if (this.flRequirements?.flFeeBps) {
             this.values = this.getRebalanceValues();
         }

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

@@ -6,15 +6,15 @@ export declare class TransactionTooLargeError extends Error {
     constructor(message: string);
 }
 export declare class TransactionItem {
-    fetchTx: (attemptNum: number) => Promise<TransactionItemInputs | undefined>;
+    fetchTx: (attemptNum: number, prevError?: Error) => Promise<TransactionItemInputs | undefined>;
     name?: string | undefined;
     lookupTableAddresses: string[];
     tx?: TransactionBuilder;
     initialized: boolean;
     orderPrio: number;
-    constructor(fetchTx: (attemptNum: number) => Promise<TransactionItemInputs | undefined>, name?: string | undefined);
+    constructor(fetchTx: (attemptNum: number, prevError?: Error) => Promise<TransactionItemInputs | undefined>, name?: string | undefined);
     initialize(): Promise<void>;
-    refetch(attemptNum: number): Promise<void>;
+    refetch(attemptNum: number, prevError?: Error): Promise<void>;
     uniqueAccounts(): string[];
 }
 export declare enum TransactionStatus {

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

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionsManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAMrB,OAAO,EAEL,aAAa,EAQd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAM5E,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IATtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,WAAW,EAAE,OAAO,CAAS;IAC7B,SAAS,EAAE,MAAM,CAAK;gBAGb,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;IAOhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAwGD,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,OAAc,EAC1B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAmBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IAyGzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA6I7B,qBAAqB;YAgDrB,eAAe;YA0Df,eAAe;CA6D9B"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionsManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAMrB,OAAO,EAEL,aAAa,EAQd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAM5E,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,KAAK,KACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IAVtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,WAAW,EAAE,OAAO,CAAS;IAC7B,SAAS,EAAE,MAAM,CAAK;gBAGb,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,KAAK,KACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK;IAOnD,cAAc,IAAI,MAAM,EAAE;CAY3B;AAwGD,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,OAAc,EAC1B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAmBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IAyGzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA8I7B,qBAAqB;YAiDrB,eAAe;YA2Df,eAAe;CA6D9B"}

package/dist/services/transactions/transactionsManager.js

@@ -52,8 +52,8 @@ class TransactionItem {
         await this.refetch(0);
         this.initialized = true;
     }
-    async refetch(attemptNum) {
-        const resp = await this.fetchTx(attemptNum);
+    async refetch(attemptNum, prevError) {
+        const resp = await this.fetchTx(attemptNum, prevError);
         this.tx = resp?.tx;
         this.lookupTableAddresses = resp?.lookupTableAddresses ?? [];
         this.orderPrio = resp?.orderPrio ?? 0;
@@ -108,9 +108,9 @@ class TransactionSet {
     async reset() {
         await this.txHandler.resetLiveTxUpdates();
     }
-    async refetchAll(attemptNum) {
+    async refetchAll(attemptNum, prevError) {
         for (const item of this.items) {
-            await item.refetch(attemptNum);
+            await item.refetch(attemptNum, prevError);
         }
     }
     async getSingleTransaction() {
@@ -366,7 +366,7 @@ class TransactionsManager {
             }
             num = attemptNum;
             if (attemptNum > 0) {
-                const refreshedSets = await this.refreshItemSets(itemSets, attemptNum);
+                const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError);
                 if (!refreshedSets || !refreshedSets.length) {
                     return;
                 }
@@ -427,7 +427,7 @@ class TransactionsManager {
                 throw prevError;
             }
             if (currentIndex > 0 || attemptNum > 0) {
-                const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, currentIndex);
+                const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError, currentIndex);
                 itemSet = refreshedSets ? refreshedSets[0] : undefined;
             }
             if (!itemSet)
@@ -442,15 +442,15 @@ class TransactionsManager {
             }
         }, this.totalRetries, this.retryDelay, this.errorsToThrow);
     }
-    async refreshItemSets(itemSets, attemptNum, currentIndex) {
+    async refreshItemSets(itemSets, attemptNum, prevError, currentIndex) {
         if (currentIndex !== undefined) {
             const itemSet = itemSets[currentIndex];
             await itemSet.reset();
-            await itemSet.refetchAll(attemptNum);
+            await itemSet.refetchAll(attemptNum, prevError);
         }
         else {
             await Promise.all(itemSets.map((itemSet) => itemSet.reset()));
-            await Promise.all(itemSets.map((itemSet) => itemSet.refetchAll(attemptNum)));
+            await Promise.all(itemSets.map((itemSet) => itemSet.refetchAll(attemptNum, prevError)));
         }
         const newItemSets = await this.assembleTransactionSets(currentIndex !== undefined
             ? [

package/dist/utils/instructionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instructionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/instructionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,0BAA0B,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,aAAa,EAEb,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gCAAgC,EAC/C,GAAG,CAAC,EAAE,kBAAkB,mBAQzB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,mBAOzD;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,gBAAgB,CAAC,gCAAgC,CAAC,EAC5D,GAAG,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,mBAY1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,mBAOrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUpE;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAcrE;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAclE;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,mBAUrC;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,SAAS,EACtB,qBAAqB,EAAE,MAAM,qBAyC9B"}
+{"version":3,"file":"instructionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/instructionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,0BAA0B,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,aAAa,EAEb,eAAe,EAEhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gCAAgC,EAC/C,GAAG,CAAC,EAAE,kBAAkB,mBAQzB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,mBAOzD;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,gBAAgB,CAAC,gCAAgC,CAAC,EAC5D,GAAG,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,mBAY1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,mBAOrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUpE;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAcrE;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAclE;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,mBAWrC;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,SAAS,EACtB,qBAAqB,EAAE,MAAM,qBAyC9B"}

package/dist/utils/instructionUtils.js

@@ -78,7 +78,7 @@ function repay(client, amount) {
     }), "repay");
 }
 function rebalance(client, targetLiqUtilizationRateBps) {
-    return new services_1.TransactionItem(async (attemptNum) => await new services_1.RebalanceTxBuilder(client, targetLiqUtilizationRateBps).buildRebalanceTx(attemptNum), "rebalance");
+    return new services_1.TransactionItem(async (attemptNum, prevError) => await new services_1.RebalanceTxBuilder(client, targetLiqUtilizationRateBps, attemptNum > 2 && prevError instanceof services_1.TransactionTooLargeError).buildRebalanceTx(attemptNum), "rebalance");
 }
 function swapThenDeposit(client, depositMint, depositAmountBaseUnit) {
     return [

package/local/txSandbox.ts

@@ -1,9 +1,8 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   consoleLog,
-  fromBaseUnit,
   getBatches,
   getClient,
   getPositionExBulk,
@@ -11,7 +10,6 @@ import {
   getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
-  openSolautoPosition,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -19,25 +17,13 @@ import {
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
-  tokenInfo,
   TransactionItem,
   TransactionsManager,
-  USDC,
-  deposit,
-  toBaseUnit,
-  RETARDIO,
-  withdraw,
-  closeSolautoPosition,
-  fetchBank,
-  getBankLiquidityAvailableBaseUnit,
-  fetchTokenPrices,
-  fetchMarginfiAccount,
-  marginfiAccountEmpty,
 } from "../src";
 import { getSecretKey } from "./shared";
 
 const payForTransaction = true;
-const testProgram = true;
+const testProgram = false;
 const lpEnv: ProgramEnv = "Prod";
 
 let [, umi] = getSolanaRpcConnection(
@@ -48,7 +34,7 @@ let [, umi] = getSolanaRpcConnection(
 
 const signer = createSignerFromKeypair(
   umi,
-  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey()))
+  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
 );
 
 export async function main() {
@@ -60,53 +46,27 @@ export async function main() {
     lpEnv,
   });
 
-  // await client.initialize({
-  //   positionId: 2,
-  //   supplyMint: new PublicKey(USDC),
-  //   debtMint: new PublicKey(RETARDIO),
-  //   lpPoolAccount: new PublicKey("EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm")
-  //   // authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
-  //   // lpUserAccount: new PublicKey(
-  //   //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
-  //   // ),
-  // });
-
-  const bank = await fetchBank(client.umi, publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM"));
-
-  const mint = new PublicKey(RETARDIO);
-  const [price] = await fetchTokenPrices([mint]);
-  const debtAvailableBaseUnit = getBankLiquidityAvailableBaseUnit(bank, false);
-  const debtAvailable = fromBaseUnit(debtAvailableBaseUnit, tokenInfo(mint).decimals);
-  const debtAvailableUsd = debtAvailable * price;
-
-  console.log(debtAvailable, debtAvailableUsd);
-
-  const account = await fetchMarginfiAccount(umi, publicKey("CKDgZfh7b7FdYyL7qWxYTKmyKYgr2PzsQcm2b5ptDxYW"));
-
-  console.log(marginfiAccountEmpty(account));
+  await client.initialize({
+    positionId: 3,
+    authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
+    // lpUserAccount: new PublicKey(
+    //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
+    // ),
+  });
 
-  // const transactionItems = [
-  //   openSolautoPosition(client, {
-  //     boostGap: 250,
-  //     boostToBps: 8681,
-  //     repayGap: 250,
-  //     repayToBps: 8681,
-  //   }),
-  //   deposit(client, toBaseUnit(10, tokenInfo(new PublicKey(USDC)).decimals)),
-  //   rebalance(client, 8500),
-  // ];
+  const transactionItems = [rebalance(client)];
 
-  // const txManager = new TransactionsManager(
-  //   client,
-  //   undefined,
-  //   payForTransaction ? "normal" : "only-simulate",
-  //   PriorityFeeSetting.High,
-  //   true,
-  //   undefined,
-  //   { totalRetries: 5 }
-  // );
-  // const statuses = await txManager.clientSend(transactionItems);
-  // consoleLog(statuses);
+  const txManager = new TransactionsManager(
+    client,
+    undefined,
+    payForTransaction ? "normal" : "only-simulate",
+    PriorityFeeSetting.High,
+    true,
+    undefined,
+    { totalRetries: 5 }
+  );
+  const statuses = await txManager.clientSend(transactionItems);
+  consoleLog(statuses);
 }
 
 async function refreshAll() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.682",
+  "version": "1.0.684",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -15,12 +15,10 @@ import {
   getTokenAccount,
   hasFirstRebalance,
   hasLastRebalance,
-  realtimeUsdToEmaUsd,
   safeGetPrice,
   tokenInfo,
 } from "../../utils";
 import {
-  LendingPlatform,
   PositionTokenState,
   PriceType,
   RebalanceDirection,
@@ -44,11 +42,11 @@ export class RebalanceTxBuilder {
   private swapManager!: RebalanceSwapManager;
   private flRequirements?: FlashLoanRequirements;
   private priceType: PriceType = PriceType.Realtime;
-  private flFeeBps?: number;
 
   constructor(
     private client: SolautoClient,
-    private targetLiqUtilizationRateBps?: number
+    private targetLiqUtilizationRateBps?: number,
+    private optimizeSize?: boolean
   ) {}
 
   private shouldProceedWithRebalance() {
@@ -154,15 +152,15 @@ export class RebalanceTxBuilder {
     return intermediaryLiqUtilizationRateBps;
   }
 
-  private async flashLoanRequirements(
-    attemptNum: number
-  ): Promise<FlashLoanRequirements | undefined> {
+  private async flashLoanRequirements(): Promise<
+    FlashLoanRequirements | undefined
+  > {
     const intermediaryLiqUtilizationRateBps =
       this.intermediaryLiqUtilizationRateBps();
     const maxLtvRateBps = getMaxLiqUtilizationRateBps(
       this.client.pos.state.maxLtvBps,
       this.client.pos.state.liqThresholdBps,
-      0.01
+      0.015
     );
     if (intermediaryLiqUtilizationRateBps < maxLtvRateBps) {
       return undefined;
@@ -173,7 +171,7 @@ export class RebalanceTxBuilder {
       this.client.flProvider.liquidityAvailable(TokenType.Debt)
     );
 
-    if ((attemptNum ?? 0) >= 3 || stdFlLiquiditySource === undefined) {
+    if (stdFlLiquiditySource === undefined || this.optimizeSize) {
       consoleLog("Checking signer liquidity");
       const { supplyBalance, debtBalance } = await this.client.signerBalances();
       const signerFlLiquiditySource = this.getFlLiquiditySource(
@@ -280,7 +278,7 @@ export class RebalanceTxBuilder {
     }
     this.values = rebalanceValues;
 
-    this.flRequirements = await this.flashLoanRequirements(attemptNum);
+    this.flRequirements = await this.flashLoanRequirements();
     if (this.flRequirements?.flFeeBps) {
       this.values = this.getRebalanceValues()!;
     }

package/src/services/transactions/transactionsManager.ts

@@ -88,7 +88,8 @@ export class TransactionItem {
 
   constructor(
     public fetchTx: (
-      attemptNum: number
+      attemptNum: number,
+      prevError?: Error
     ) => Promise<TransactionItemInputs | undefined>,
     public name?: string
   ) {}
@@ -98,8 +99,8 @@ export class TransactionItem {
     this.initialized = true;
   }
 
-  async refetch(attemptNum: number) {
-    const resp = await this.fetchTx(attemptNum);
+  async refetch(attemptNum: number, prevError?: Error) {
+    const resp = await this.fetchTx(attemptNum, prevError);
     this.tx = resp?.tx;
     this.lookupTableAddresses = resp?.lookupTableAddresses ?? [];
     this.orderPrio = resp?.orderPrio ?? 0;
@@ -182,9 +183,9 @@ class TransactionSet {
     await this.txHandler.resetLiveTxUpdates();
   }
 
-  async refetchAll(attemptNum: number) {
+  async refetchAll(attemptNum: number, prevError?: Error) {
     for (const item of this.items) {
-      await item.refetch(attemptNum);
+      await item.refetch(attemptNum, prevError);
     }
   }
 
@@ -593,7 +594,8 @@ export class TransactionsManager {
         if (attemptNum > 0) {
           const refreshedSets = await this.refreshItemSets(
             itemSets,
-            attemptNum
+            attemptNum,
+            prevError
           );
           if (!refreshedSets || !refreshedSets.length) {
             return;
@@ -734,6 +736,7 @@ export class TransactionsManager {
           const refreshedSets = await this.refreshItemSets(
             itemSets,
             attemptNum,
+            prevError,
             currentIndex
           );
           itemSet = refreshedSets ? refreshedSets[0] : undefined;
@@ -766,16 +769,17 @@ export class TransactionsManager {
   private async refreshItemSets(
     itemSets: TransactionSet[],
     attemptNum: number,
+    prevError?: Error,
     currentIndex?: number
   ): Promise<TransactionSet[] | undefined> {
     if (currentIndex !== undefined) {
       const itemSet = itemSets[currentIndex];
       await itemSet.reset();
-      await itemSet.refetchAll(attemptNum);
+      await itemSet.refetchAll(attemptNum, prevError);
     } else {
       await Promise.all(itemSets.map((itemSet) => itemSet.reset()));
       await Promise.all(
-        itemSets.map((itemSet) => itemSet.refetchAll(attemptNum))
+        itemSets.map((itemSet) => itemSet.refetchAll(attemptNum, prevError))
       );
     }
 

package/src/utils/instructionUtils.ts

@@ -9,9 +9,9 @@ import {
   SolautoClient,
   SwapInput,
   TransactionItem,
+  TransactionTooLargeError,
 } from "../services";
 import { PublicKey } from "@solana/web3.js";
-import { tokenInfo } from "./generalUtils";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
 export function openSolautoPosition(
@@ -123,10 +123,11 @@ export function rebalance(
   targetLiqUtilizationRateBps?: number
 ) {
   return new TransactionItem(
-    async (attemptNum) =>
+    async (attemptNum, prevError) =>
       await new RebalanceTxBuilder(
         client,
-        targetLiqUtilizationRateBps
+        targetLiqUtilizationRateBps,
+        attemptNum > 2 && prevError instanceof TransactionTooLargeError
       ).buildRebalanceTx(attemptNum),
     "rebalance"
   );