@haven-fi/solauto-sdk 1.0.711 → 1.0.713

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

@@ -4,12 +4,13 @@ export declare class RebalanceTxBuilder {
     private client;
     private targetLiqUtilizationRateBps?;
     private optimizeSize?;
+    private bpsDistanceFromRebalance?;
     private values;
     private rebalanceType;
     private swapManager;
     private flRequirements?;
     private priceType;
-    constructor(client: SolautoClient, targetLiqUtilizationRateBps?: number | undefined, optimizeSize?: boolean | undefined);
+    constructor(client: SolautoClient, targetLiqUtilizationRateBps?: number | undefined, optimizeSize?: boolean | undefined, bpsDistanceFromRebalance?: number | 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;AAiCrB,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;IAwC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAyBnB,sBAAsB;YAyBtB,mBAAmB;IAsFpB,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;AAiCrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,wBAAwB,CAAC;IAVnC,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,EACtB,wBAAwB,CAAC,EAAE,MAAM,YAAA;IAG3C,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IAwC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAyBnB,sBAAsB;YAyBtB,mBAAmB;IAsFpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -10,10 +10,11 @@ const rebalanceValues_1 = require("./rebalanceValues");
 const solautoFees_1 = require("./solautoFees");
 const rebalanceSwapManager_1 = require("./rebalanceSwapManager");
 class RebalanceTxBuilder {
-    constructor(client, targetLiqUtilizationRateBps, optimizeSize) {
+    constructor(client, targetLiqUtilizationRateBps, optimizeSize, bpsDistanceFromRebalance) {
         this.client = client;
         this.targetLiqUtilizationRateBps = targetLiqUtilizationRateBps;
         this.optimizeSize = optimizeSize;
+        this.bpsDistanceFromRebalance = bpsDistanceFromRebalance;
         this.priceType = generated_1.PriceType.Realtime;
     }
     shouldProceedWithRebalance() {
@@ -22,7 +23,7 @@ class RebalanceTxBuilder {
         }
         return (this.client.pos.supplyUsd() > 0 &&
             (this.targetLiqUtilizationRateBps !== undefined ||
-                this.client.pos.eligibleForRebalance()));
+                this.client.pos.eligibleForRebalance(this.bpsDistanceFromRebalance)));
     }
     getRebalanceValues() {
         return (0, rebalanceValues_1.getRebalanceValues)(this.client.pos, this.priceType, this.targetLiqUtilizationRateBps, solautoFees_1.SolautoFeesBps.create(this.client.isReferred, this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd(this.priceType)), this.flRequirements?.flFeeBps ?? 0);

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

@@ -55,6 +55,7 @@ export declare class TransactionsManager<T extends TxHandler> {
     protected getUpdatedPriorityFeeSetting(prevError: Error | undefined, attemptNum: number): PriorityFeeSetting;
     private updateStatusForSets;
     send(items: TransactionItem[]): Promise<TransactionManagerStatuses>;
+    private shouldProceedToSend;
     private processTransactionsAtomically;
     private processTransactionSet;
     private refreshItemSets;

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":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,aAAa,EAId,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAEzE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAED,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,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,SAAS;IAC1D,SAAS,EAAE,CAAC,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChE,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,SAAS;IAClD,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAC1E,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAM;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B,kBAAkB,SAAmB;gBAEzB,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC;YAmB9B,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAoBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YAiJ7B,qBAAqB;YAiDrB,eAAe;cA2Db,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;CAyDjC"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/transactionsManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,aAAa,EAId,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAEzE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAED,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,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,SAAS;IAC1D,SAAS,EAAE,CAAC,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChE,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,SAAS;IAClD,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAC1E,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAM;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B,kBAAkB,SAAmB;gBAEzB,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC;YAmB9B,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAoBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;IA8BtC,OAAO,CAAC,mBAAmB;YAoBb,6BAA6B;YAwJ7B,qBAAqB;YAmDrB,eAAe;cAkDb,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;CAyDjC"}

package/dist/services/transactions/manager/transactionsManager.js

@@ -165,6 +165,19 @@ class TransactionsManager {
         }
         return this.statuses;
     }
+    shouldProceedToSend(itemSets, attemptNum) {
+        if (!itemSets) {
+            return false;
+        }
+        const newItemSetNames = itemSets.flatMap((x) => x.items.map((y) => y.name ?? ""));
+        if (newItemSetNames.length === 1 &&
+            newItemSetNames[0] === this.updateOracleTxName) {
+            (0, utils_1.consoleLog)("Skipping unnecessary oracle update");
+            this.updateStatusForSets(itemSets, TransactionStatus.Skipped, attemptNum);
+            return false;
+        }
+        return true;
+    }
     async processTransactionsAtomically(itemSets) {
         let num = 0;
         let priorityFeeSetting;
@@ -186,6 +199,9 @@ class TransactionsManager {
                     itemSets = refreshedSets;
                 }
             }
+            if (!this.shouldProceedToSend(itemSets, attemptNum)) {
+                return;
+            }
             transactions = [];
             for (const set of itemSets) {
                 transactions.push(await set.getSingleTransaction());
@@ -242,8 +258,9 @@ class TransactionsManager {
                 const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError, currentIndex);
                 itemSet = refreshedSets ? refreshedSets[0] : undefined;
             }
-            if (!itemSet)
+            if (!itemSet || !this.shouldProceedToSend([itemSet], attemptNum)) {
                 return;
+            }
             const tx = await itemSet.getSingleTransaction();
             if (tx.getInstructions().length === 0) {
                 this.updateStatus(itemSet.name(), TransactionStatus.Skipped, attemptNum);
@@ -272,12 +289,6 @@ class TransactionsManager {
                 ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
             ]
             : itemSets.flatMap((set) => set.items));
-        const newItemSetNames = newItemSets.map((x) => x.name());
-        if (newItemSetNames.length === 1 &&
-            newItemSetNames[0] === this.updateOracleTxName) {
-            (0, utils_1.consoleLog)("Skipping unnecessary oracle update");
-            return undefined;
-        }
         if (currentIndex !== undefined && newItemSets.length > 1) {
             itemSets.splice(currentIndex, itemSets.length - currentIndex, ...newItemSets);
             const startOfQueuedStatuses = this.statuses.findIndex((x) => x.status === TransactionStatus.Queued);

package/dist/utils/instructionUtils.d.ts

@@ -10,6 +10,6 @@ export declare function deposit(client: SolautoClient, baseUnitAmount: bigint):
 export declare function borrow(client: SolautoClient, baseUnitAmount: bigint): TransactionItem;
 export declare function withdraw(client: SolautoClient, amount: "All" | bigint): TransactionItem;
 export declare function repay(client: SolautoClient, amount: "All" | bigint): TransactionItem;
-export declare function rebalance(client: SolautoClient, targetLiqUtilizationRateBps?: number): TransactionItem;
+export declare function rebalance(client: SolautoClient, targetLiqUtilizationRateBps?: number, bpsDistanceFromRebalance?: number): TransactionItem;
 export declare function swapThenDeposit(client: SolautoClient, depositMint: PublicKey, depositAmountBaseUnit: bigint): TransactionItem[];
 //# sourceMappingURL=instructionUtils.d.ts.map

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,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,mBAWnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAerE;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,mBAYrC;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,mBAWnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAerE;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,EACpC,wBAAwB,CAAC,EAAE,MAAM,mBAalC;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,SAAS,EACtB,qBAAqB,EAAE,MAAM,qBAyC9B"}

package/dist/utils/instructionUtils.js

@@ -77,8 +77,8 @@ function repay(client, amount) {
         }),
     }), "repay");
 }
-function rebalance(client, targetLiqUtilizationRateBps) {
-    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", true);
+function rebalance(client, targetLiqUtilizationRateBps, bpsDistanceFromRebalance) {
+    return new services_1.TransactionItem(async (attemptNum, prevError) => await new services_1.RebalanceTxBuilder(client, targetLiqUtilizationRateBps, attemptNum > 2 && prevError instanceof services_1.TransactionTooLargeError, bpsDistanceFromRebalance).buildRebalanceTx(attemptNum), "rebalance", true);
 }
 function swapThenDeposit(client, depositMint, depositAmountBaseUnit) {
     return [

package/local/txSandbox.ts

@@ -47,8 +47,8 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 2,
-    authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
+    positionId: 1,
+    authority: new PublicKey("96929DasYJ2nbfdsFmUNzns2BQ9wKVfXbNoUDbc9zFUS"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),

package/package.json

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

@@ -49,7 +49,8 @@ export class RebalanceTxBuilder {
   constructor(
     private client: SolautoClient,
     private targetLiqUtilizationRateBps?: number,
-    private optimizeSize?: boolean
+    private optimizeSize?: boolean,
+    private bpsDistanceFromRebalance?: number
   ) {}
 
   private shouldProceedWithRebalance() {
@@ -62,7 +63,7 @@ export class RebalanceTxBuilder {
     return (
       this.client.pos.supplyUsd() > 0 &&
       (this.targetLiqUtilizationRateBps !== undefined ||
-        this.client.pos.eligibleForRebalance())
+        this.client.pos.eligibleForRebalance(this.bpsDistanceFromRebalance))
     );
   }
 

package/src/services/transactions/manager/transactionsManager.ts

@@ -267,6 +267,26 @@ export class TransactionsManager<T extends TxHandler> {
     return this.statuses;
   }
 
+  private shouldProceedToSend(itemSets: TransactionSet[], attemptNum: number) {
+    if (!itemSets) {
+      return false;
+    }
+
+    const newItemSetNames = itemSets.flatMap((x) =>
+      x.items.map((y) => y.name ?? "")
+    );
+    if (
+      newItemSetNames.length === 1 &&
+      newItemSetNames[0] === this.updateOracleTxName
+    ) {
+      consoleLog("Skipping unnecessary oracle update");
+      this.updateStatusForSets(itemSets, TransactionStatus.Skipped, attemptNum);
+      return false;
+    }
+
+    return true;
+  }
+
   private async processTransactionsAtomically(itemSets: TransactionSet[]) {
     let num = 0;
     let priorityFeeSetting: PriorityFeeSetting;
@@ -283,7 +303,10 @@ export class TransactionsManager<T extends TxHandler> {
         }
 
         num = attemptNum;
-        priorityFeeSetting = this.getUpdatedPriorityFeeSetting(prevError, attemptNum);
+        priorityFeeSetting = this.getUpdatedPriorityFeeSetting(
+          prevError,
+          attemptNum
+        );
 
         if (attemptNum > 0) {
           const refreshedSets = await this.refreshItemSets(
@@ -298,6 +321,10 @@ export class TransactionsManager<T extends TxHandler> {
           }
         }
 
+        if (!this.shouldProceedToSend(itemSets, attemptNum)) {
+          return;
+        }
+
         transactions = [];
         for (const set of itemSets) {
           transactions.push(await set.getSingleTransaction());
@@ -436,7 +463,9 @@ export class TransactionsManager<T extends TxHandler> {
           );
           itemSet = refreshedSets ? refreshedSets[0] : undefined;
         }
-        if (!itemSet) return;
+        if (!itemSet || !this.shouldProceedToSend([itemSet], attemptNum)) {
+          return;
+        }
 
         const tx = await itemSet.getSingleTransaction();
         if (tx.getInstructions().length === 0) {
@@ -487,15 +516,6 @@ export class TransactionsManager<T extends TxHandler> {
         : itemSets.flatMap((set) => set.items)
     );
 
-    const newItemSetNames = newItemSets.map((x) => x.name());
-    if (
-      newItemSetNames.length === 1 &&
-      newItemSetNames[0] === this.updateOracleTxName
-    ) {
-      consoleLog("Skipping unnecessary oracle update");
-      return undefined;
-    }
-
     if (currentIndex !== undefined && newItemSets.length > 1) {
       itemSets.splice(
         currentIndex,

package/src/utils/instructionUtils.ts

@@ -122,14 +122,16 @@ export function repay(client: SolautoClient, amount: "All" | bigint) {
 
 export function rebalance(
   client: SolautoClient,
-  targetLiqUtilizationRateBps?: number
+  targetLiqUtilizationRateBps?: number,
+  bpsDistanceFromRebalance?: number
 ) {
   return new TransactionItem(
     async (attemptNum, prevError) =>
       await new RebalanceTxBuilder(
         client,
         targetLiqUtilizationRateBps,
-        attemptNum > 2 && prevError instanceof TransactionTooLargeError
+        attemptNum > 2 && prevError instanceof TransactionTooLargeError,
+        bpsDistanceFromRebalance
       ).buildRebalanceTx(attemptNum),
     "rebalance",
     true