@haven-fi/solauto-sdk 1.0.634 → 1.0.636

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

@@ -16,6 +16,7 @@ export declare class RebalanceTxBuilder {
     private getFlashLoanDetails;
     private setRebalanceType;
     private realtimeUsdToEmaUsd;
+    private getInitialRebalanceValues;
     private setRebalanceDetails;
     private refreshBeforeRebalance;
     private assembleTransaction;

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;AA0BrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IARtC,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,CAAa;gBAGpB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;YAyCd,qBAAqB;IAyCnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,mBAAmB;YAOb,mBAAmB;YAqCnB,sBAAsB;YAyBtB,mBAAmB;IAkEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAW9C"}
+{"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;AA0BrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IARtC,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;IAG9C,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;YAyCd,qBAAqB;IAyCnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,yBAAyB;YA4BnB,mBAAmB;YAwBnB,sBAAsB;YAyBtB,mBAAmB;IAkEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -13,6 +13,7 @@ class RebalanceTxBuilder {
     constructor(client, targetLiqUtilizationRateBps) {
         this.client = client;
         this.targetLiqUtilizationRateBps = targetLiqUtilizationRateBps;
+        this.priceType = generated_1.PriceType.Realtime;
     }
     shouldProceedWithRebalance() {
         return (this.client.pos.supplyUsd() > 0 &&
@@ -117,14 +118,27 @@ class RebalanceTxBuilder {
         return ((realtimeAmountUsd / (0, utils_1.safeGetPrice)(mint, generated_1.PriceType.Realtime)) *
             (0, utils_1.safeGetPrice)(mint, generated_1.PriceType.Ema));
     }
-    async setRebalanceDetails(attemptNum) {
-        this.priceType = generated_1.PriceType.Realtime;
-        this.values = this.getRebalanceValues();
-        const postRebalanceEmaUtilRateBps = (0, utils_1.getLiqUtilzationRateBps)(this.realtimeUsdToEmaUsd(this.values.endResult.supplyUsd, this.client.pos.supplyMint), this.realtimeUsdToEmaUsd(this.values.endResult.debtUsd, this.client.pos.debtMint), this.client.pos.state.liqThresholdBps);
+    getInitialRebalanceValues() {
+        let rebalanceValues = this.getRebalanceValues();
+        if (!rebalanceValues) {
+            return undefined;
+        }
+        const postRebalanceEmaUtilRateBps = (0, utils_1.getLiqUtilzationRateBps)(this.realtimeUsdToEmaUsd(rebalanceValues.endResult.supplyUsd, this.client.pos.supplyMint), this.realtimeUsdToEmaUsd(rebalanceValues.endResult.debtUsd, this.client.pos.debtMint), this.client.pos.state.liqThresholdBps);
         if (postRebalanceEmaUtilRateBps > this.client.pos.maxBoostToBps) {
             this.priceType = generated_1.PriceType.Ema;
-            this.values = this.getRebalanceValues();
+            rebalanceValues = this.getRebalanceValues();
+            if (!rebalanceValues) {
+                return undefined;
+            }
         }
+        return rebalanceValues;
+    }
+    async setRebalanceDetails(attemptNum) {
+        const rebalanceValues = this.getInitialRebalanceValues();
+        if (!rebalanceValues) {
+            return false;
+        }
+        this.values = rebalanceValues;
         this.flRequirements = await this.flashLoanRequirements(attemptNum);
         if (this.flRequirements?.flFeeBps) {
             this.values = this.getRebalanceValues(this.flRequirements.flFeeBps);
@@ -132,6 +146,7 @@ class RebalanceTxBuilder {
         this.swapManager = new rebalanceSwapManager_1.RebalanceSwapManager(this.client, this.values, this.flRequirements, this.targetLiqUtilizationRateBps);
         await this.swapManager.setSwapParams(attemptNum);
         this.setRebalanceType();
+        return true;
     }
     async refreshBeforeRebalance() {
         if (this.client.selfManaged ||
@@ -200,7 +215,10 @@ class RebalanceTxBuilder {
             this.client.log("Not eligible for a rebalance");
             return undefined;
         }
-        await this.setRebalanceDetails(attemptNum);
+        const proceed = await this.setRebalanceDetails(attemptNum);
+        if (!proceed) {
+            return undefined;
+        }
         return await this.assembleTransaction();
     }
 }

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

@@ -26,6 +26,6 @@ export interface RebalanceValues extends DebtAdjustment {
     tokenBalanceChange?: TokenBalanceChange;
     repayingCloseToMaxLtv: boolean;
 }
-export declare function getRebalanceValues(solautoPosition: SolautoPositionEx, priceType: PriceType, targetLiqUtilizationRateBps?: number, solautoFeeBps?: SolautoFeesBps, flFeeBps?: number): RebalanceValues;
+export declare function getRebalanceValues(solautoPosition: SolautoPositionEx, priceType: PriceType, targetLiqUtilizationRateBps?: number, solautoFeeBps?: SolautoFeesBps, flFeeBps?: number): RebalanceValues | undefined;
 export {};
 //# sourceMappingURL=rebalanceValues.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"rebalanceValues.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,SAAS,EACT,kBAAkB,EAClB,kBAAkB,EAEnB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,cAAc,CAAC;IAC1B,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,yBAAyB;IACjC,MAAM,EAAE,cAAc,CAAC;IACvB,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,gBAAgB,GACtB,yBAAyB,CA8B3B;AAED,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,MAAM,EACnC,IAAI,CAAC,EAAE,gBAAgB,GACtB,cAAc,CAgChB;AA2ED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,iBAAiB,EAClC,SAAS,EAAE,SAAS,EACpB,2BAA2B,CAAC,EAAE,MAAM,EACpC,aAAa,CAAC,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,CA2CjB"}
+{"version":3,"file":"rebalanceValues.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,SAAS,EACT,kBAAkB,EAClB,kBAAkB,EAEnB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,cAAc,CAAC;IAC1B,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,yBAAyB;IACjC,MAAM,EAAE,cAAc,CAAC;IACvB,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,gBAAgB,GACtB,yBAAyB,CA8B3B;AAED,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,MAAM,EACnC,IAAI,CAAC,EAAE,gBAAgB,GACtB,cAAc,CAgChB;AA2ED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,iBAAiB,EAClC,SAAS,EAAE,SAAS,EACpB,2BAA2B,CAAC,EAAE,MAAM,EACpC,aAAa,CAAC,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,GAAG,SAAS,CA8C7B"}

package/dist/services/rebalance/rebalanceValues.js

@@ -67,7 +67,7 @@ function getTargetLiqUtilizationRateBps(solautoPosition, priceType, targetLiqUti
     //   else if (tokenBalanceChange !== null) {
     //     return currentRate;
     //   }
-    throw new generated_1.InvalidRebalanceConditionError((0, generated_1.createSolautoProgram)());
+    return undefined;
 }
 function getAdjustedPositionValues(solautoPosition, priceType, tokenBalanceChange) {
     let supplyUsd = solautoPosition.supplyUsd(priceType);
@@ -100,6 +100,9 @@ function getRebalanceDirection(solautoPosition, targetLtvBps) {
 function getRebalanceValues(solautoPosition, priceType, targetLiqUtilizationRateBps, solautoFeeBps, flFeeBps) {
     const tokenBalanceChange = getTokenBalanceChange();
     const targetRate = getTargetLiqUtilizationRateBps(solautoPosition, priceType, targetLiqUtilizationRateBps, tokenBalanceChange);
+    if (targetRate === undefined) {
+        return undefined;
+    }
     const rebalanceDirection = getRebalanceDirection(solautoPosition, targetRate);
     const position = getAdjustedPositionValues(solautoPosition, priceType, tokenBalanceChange);
     const fees = {

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

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA2BjE,OAAO,EAAE,qBAAqB,EAAyB,MAAM,aAAa,CAAC;AAwL3E,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA8LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EAuH/B"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA2BjE,OAAO,EAAE,qBAAqB,EAAyB,MAAM,aAAa,CAAC;AAwL3E,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA8LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EA8G/B"}

package/dist/services/transactions/transactionUtils.js

@@ -339,14 +339,6 @@ async function convertReferralFeesToDestination(referralManager, tokenAccount, d
     return { tx, lookupTableAddresses };
 }
 function getErrorInfo(umi, txs, error, simulationSuccessful) {
-    if (error instanceof generated_1.InvalidRebalanceConditionError) {
-        return {
-            canBeIgnored: true,
-            errorName: generated_1.InvalidRebalanceConditionError.name,
-            errorInfo: new generated_1.InvalidRebalanceConditionError((0, generated_1.createSolautoProgram)())
-                .message,
-        };
-    }
     let canBeIgnored = false;
     let errorName = undefined;
     let errorInfo = undefined;

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -80,13 +80,13 @@ export declare abstract class SolautoPositionEx {
     updateSupply(newSupplyUsd: number, supplyPrice?: number): void;
     updateDebt(newDebtUsd: number, debtPrice?: number): void;
     updateNetWorth(supplyPrice?: number): void;
-    updateLiqUtilizationRate(priceType?: PriceType): void;
+    updateLiqUtilizationRate(supplyUsd?: number, debtUsd?: number, priceType?: PriceType): void;
     updateWithLatestPrices(data?: {
         priceType?: PriceType;
         supplyPrice?: number;
         debtPrice?: number;
     }): Promise<void>;
-    simulateRebalance(unixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number): void;
+    simulateRebalance(unixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number): undefined;
     refetchPositionData(): Promise<void>;
 }
 export {};

package/dist/solautoPosition/solautoPositionEx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"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"}

package/dist/solautoPosition/solautoPositionEx.js

@@ -201,8 +201,8 @@ class SolautoPositionEx {
             (0, utils_1.toRoundedUsdValue)(netWorthUsd);
         this._data.state.netWorth.baseUnit = (0, utils_1.toBaseUnit)(netWorthUsd / (supplyPrice ?? (0, utils_1.safeGetPrice)(this.supplyMint) ?? 0), this.supplyMintInfo.decimals);
     }
-    updateLiqUtilizationRate(priceType) {
-        this._data.state.liqUtilizationRateBps = (0, utils_1.getLiqUtilzationRateBps)(this.supplyUsd(priceType), this.debtUsd(priceType), this.state.liqThresholdBps);
+    updateLiqUtilizationRate(supplyUsd, debtUsd, priceType) {
+        this._data.state.liqUtilizationRateBps = (0, utils_1.getLiqUtilzationRateBps)(supplyUsd ?? this.supplyUsd(priceType), debtUsd ?? this.debtUsd(priceType), this.state.liqThresholdBps);
     }
     async updateWithLatestPrices(data) {
         if (!data) {
@@ -216,15 +216,18 @@ class SolautoPositionEx {
         this.updateSupply(supplyUsd, data.supplyPrice);
         this.updateDebt(debtUsd, data.debtPrice);
         this.updateNetWorth(data.supplyPrice);
-        this.updateLiqUtilizationRate();
+        this.updateLiqUtilizationRate(this.totalSupply * data.supplyPrice, this.totalDebt * data.debtPrice);
     }
     simulateRebalance(unixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps) {
         this._data.state.lastRefreshed = BigInt(unixTime);
         const rebalance = (0, rebalance_1.getRebalanceValues)(this, generated_1.PriceType.Realtime, targetLiqUtilizationRateBps, rebalance_1.SolautoFeesBps.create(true, targetLiqUtilizationRateBps, this.netWorthUsd));
+        if (!rebalance) {
+            return undefined;
+        }
         this.updateSupply(rebalance.endResult.supplyUsd, supplyPrice);
         this.updateDebt(rebalance.endResult.debtUsd, debtPrice);
         this.updateNetWorth(supplyPrice);
-        this.updateLiqUtilizationRate();
+        this.updateLiqUtilizationRate(rebalance.endResult.supplyUsd, rebalance.endResult.debtUsd);
     }
     async refetchPositionData() {
         this._data = await (0, generated_1.fetchSolautoPosition)(this.umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(this.publicKey));

package/local/txSandbox.ts

@@ -3,29 +3,28 @@ import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   consoleLog,
-  fetchTokenPrices,
   getClient,
   getSolanaRpcConnection,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
-  PriceType,
   PriorityFeeSetting,
+  ProgramEnv,
   rebalance,
-  safeGetPrice,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   TransactionsManager,
 } from "../src";
 import { getSecretKey } from "./shared";
-import { NATIVE_MINT } from "@solana/spl-token";
 
 const payForTransaction = false;
 const testProgram = true;
+const lpEnv: ProgramEnv = "Prod";
 
 export async function main() {
-  const [, umi] = getSolanaRpcConnection(
+  let [, umi] = getSolanaRpcConnection(
     LOCAL_IRONFORGE_API_URL,
-    testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
+    testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+    lpEnv
   );
 
   const signer = createSignerFromKeypair(
@@ -33,36 +32,33 @@ export async function main() {
     fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
   );
 
-  await fetchTokenPrices([NATIVE_MINT]);
+  const client = getClient(LendingPlatform.Marginfi, {
+    signer,
+    showLogs: true,
+    rpcUrl: LOCAL_IRONFORGE_API_URL,
+    programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+    lpEnv,
+  });
 
-  console.log(safeGetPrice(NATIVE_MINT), safeGetPrice(NATIVE_MINT, PriceType.Ema));
+  await client.initialize({
+    positionId: 1,
+    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+  });
 
-  // const client = getClient(LendingPlatform.Marginfi, {
-  //   signer,
-  //   showLogs: true,
-  //   rpcUrl: LOCAL_IRONFORGE_API_URL,
-  //   programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
-  // });
+  const transactionItems = [rebalance(client)];
 
-  // await client.initialize({
-  //   positionId: 3,
-  //   authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
-  // });
-
-  // const transactionItems = [rebalance(client)];
-
-  // const txManager = new TransactionsManager(
-  //   client,
-  //   undefined,
-  //   payForTransaction ? "normal" : "only-simulate",
-  //   PriorityFeeSetting.Min,
-  //   true,
-  //   undefined,
-  //   { totalRetries: 5 }
-  // );
-  // const statuses = await txManager.clientSend(transactionItems);
+  const txManager = new TransactionsManager(
+    client,
+    undefined,
+    payForTransaction ? "normal" : "only-simulate",
+    PriorityFeeSetting.Min,
+    true,
+    undefined,
+    { totalRetries: 5 }
+  );
+  const statuses = await txManager.clientSend(transactionItems);
 
-  // consoleLog(statuses);
+  consoleLog(statuses);
 }
 
 main();

package/package.json

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

@@ -37,7 +37,7 @@ export class RebalanceTxBuilder {
   private rebalanceType!: SolautoRebalanceType;
   private swapManager!: RebalanceSwapManager;
   private flRequirements?: FlashLoanRequirements;
-  private priceType!: PriceType;
+  private priceType: PriceType = PriceType.Realtime;
 
   constructor(
     private client: SolautoClient,
@@ -210,30 +210,44 @@ export class RebalanceTxBuilder {
     );
   }
 
-  private async setRebalanceDetails(attemptNum: number) {
-    this.priceType = PriceType.Realtime;
-    this.values = this.getRebalanceValues();
+  private getInitialRebalanceValues() {
+    let rebalanceValues = this.getRebalanceValues();
+    if (!rebalanceValues) {
+      return undefined;
+    }
 
     const postRebalanceEmaUtilRateBps = getLiqUtilzationRateBps(
       this.realtimeUsdToEmaUsd(
-        this.values.endResult.supplyUsd,
+        rebalanceValues.endResult.supplyUsd,
         this.client.pos.supplyMint
       ),
       this.realtimeUsdToEmaUsd(
-        this.values.endResult.debtUsd,
+        rebalanceValues.endResult.debtUsd,
         this.client.pos.debtMint
       ),
       this.client.pos.state.liqThresholdBps
     );
     if (postRebalanceEmaUtilRateBps > this.client.pos.maxBoostToBps) {
       this.priceType = PriceType.Ema;
-      this.values = this.getRebalanceValues();
+      rebalanceValues = this.getRebalanceValues();
+      if (!rebalanceValues) {
+        return undefined;
+      }
     }
 
-    this.flRequirements = await this.flashLoanRequirements(attemptNum);
+    return rebalanceValues;
+  }
+
+  private async setRebalanceDetails(attemptNum: number): Promise<boolean> {
+    const rebalanceValues = this.getInitialRebalanceValues();
+    if (!rebalanceValues) {
+      return false;
+    }
+    this.values = rebalanceValues;
 
+    this.flRequirements = await this.flashLoanRequirements(attemptNum);
     if (this.flRequirements?.flFeeBps) {
-      this.values = this.getRebalanceValues(this.flRequirements.flFeeBps);
+      this.values = this.getRebalanceValues(this.flRequirements.flFeeBps)!;
     }
 
     this.swapManager = new RebalanceSwapManager(
@@ -245,6 +259,7 @@ export class RebalanceTxBuilder {
     await this.swapManager.setSwapParams(attemptNum);
 
     this.setRebalanceType();
+    return true;
   }
 
   private async refreshBeforeRebalance() {
@@ -348,7 +363,11 @@ export class RebalanceTxBuilder {
       return undefined;
     }
 
-    await this.setRebalanceDetails(attemptNum);
+    const proceed = await this.setRebalanceDetails(attemptNum);
+    if (!proceed) {
+      return undefined;
+    }
+
     return await this.assembleTransaction();
   }
 }

package/src/services/rebalance/rebalanceValues.ts

@@ -123,7 +123,7 @@ function getTargetLiqUtilizationRateBps(
   priceType: PriceType,
   targetLiqUtilizationRateBps: number | undefined,
   tokenBalanceChange: TokenBalanceChange | undefined
-): number {
+): number | undefined {
   if (targetLiqUtilizationRateBps !== undefined) {
     return targetLiqUtilizationRateBps;
   }
@@ -144,7 +144,7 @@ function getTargetLiqUtilizationRateBps(
   //     return currentRate;
   //   }
 
-  throw new InvalidRebalanceConditionError(createSolautoProgram());
+  return undefined;
 }
 
 function getAdjustedPositionValues(
@@ -198,7 +198,7 @@ export function getRebalanceValues(
   targetLiqUtilizationRateBps?: number,
   solautoFeeBps?: SolautoFeesBps,
   flFeeBps?: number
-): RebalanceValues {
+): RebalanceValues | undefined {
   const tokenBalanceChange = getTokenBalanceChange();
 
   const targetRate = getTargetLiqUtilizationRateBps(
@@ -207,6 +207,9 @@ export function getRebalanceValues(
     targetLiqUtilizationRateBps,
     tokenBalanceChange
   );
+  if (targetRate === undefined) {
+    return undefined;
+  }
 
   const rebalanceDirection = getRebalanceDirection(solautoPosition, targetRate);
 

package/src/services/transactions/transactionUtils.ts

@@ -604,15 +604,6 @@ export function getErrorInfo(
   error: Error,
   simulationSuccessful?: boolean
 ) {
-  if (error instanceof InvalidRebalanceConditionError) {
-    return {
-      canBeIgnored: true,
-      errorName: InvalidRebalanceConditionError.name,
-      errorInfo: new InvalidRebalanceConditionError(createSolautoProgram())
-        .message,
-    };
-  }
-
   let canBeIgnored = false;
   let errorName: string | undefined = undefined;
   let errorInfo: string | undefined = undefined;

package/src/solautoPosition/solautoPositionEx.ts

@@ -71,7 +71,7 @@ interface PositionExArgs {
 export abstract class SolautoPositionEx {
   public umi!: Umi;
   protected contextUpdates?: ContextUpdates;
-  
+
   public publicKey!: PublicKey;
   public lendingPlatform!: LendingPlatform;
   protected _data!: SolautoPositionExData;
@@ -368,10 +368,14 @@ export abstract class SolautoPositionEx {
     );
   }
 
-  updateLiqUtilizationRate(priceType?: PriceType) {
+  updateLiqUtilizationRate(
+    supplyUsd?: number,
+    debtUsd?: number,
+    priceType?: PriceType
+  ) {
     this._data.state.liqUtilizationRateBps = getLiqUtilzationRateBps(
-      this.supplyUsd(priceType),
-      this.debtUsd(priceType),
+      supplyUsd ?? this.supplyUsd(priceType),
+      debtUsd ?? this.debtUsd(priceType),
       this.state.liqThresholdBps
     );
   }
@@ -398,7 +402,10 @@ export abstract class SolautoPositionEx {
     this.updateSupply(supplyUsd, data.supplyPrice);
     this.updateDebt(debtUsd, data.debtPrice);
     this.updateNetWorth(data.supplyPrice);
-    this.updateLiqUtilizationRate();
+    this.updateLiqUtilizationRate(
+      this.totalSupply * data.supplyPrice,
+      this.totalDebt * data.debtPrice
+    );
   }
 
   simulateRebalance(
@@ -414,10 +421,14 @@ export abstract class SolautoPositionEx {
       targetLiqUtilizationRateBps,
       SolautoFeesBps.create(true, targetLiqUtilizationRateBps, this.netWorthUsd)
     );
+    if (!rebalance) {
+      return undefined;
+    }
+
     this.updateSupply(rebalance.endResult.supplyUsd, supplyPrice);
     this.updateDebt(rebalance.endResult.debtUsd, debtPrice);
     this.updateNetWorth(supplyPrice);
-    this.updateLiqUtilizationRate();
+    this.updateLiqUtilizationRate(rebalance.endResult.supplyUsd, rebalance.endResult.debtUsd);
   }
 
   async refetchPositionData() {