@haven-fi/solauto-sdk 1.0.68 → 1.0.70

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

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAGL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA8G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA0HA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA8G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA2HA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}

package/dist/transactions/transactionUtils.js

@@ -329,7 +329,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         client.log("Not eligible for a rebalance");
         return undefined;
     }
-    const values = (0, rebalanceUtils_1.getRebalanceValues)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), client.solautoPositionData?.feeType ?? generated_1.FeeType.Small, (0, generalUtils_1.currentUnixSeconds)(), constants_1.PRICES[client.supplyMint.toString()].price, constants_1.PRICES[client.debtMint.toString()].price, targetLiqUtilizationRateBps);
+    const values = (0, rebalanceUtils_1.getRebalanceValues)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), client.solautoPositionData.feeType, (0, generalUtils_1.currentUnixSeconds)(), constants_1.PRICES[client.supplyMint.toString()].price, constants_1.PRICES[client.debtMint.toString()].price, targetLiqUtilizationRateBps);
     client.log("Rebalance values: ", values);
     const swapDetails = (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, targetLiqUtilizationRateBps, attemptNum);
     const { jupQuote, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);
@@ -366,7 +366,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         ]);
     }
     if (client.solautoPositionState.liqUtilizationRateBps >
-        (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps)) {
+        (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.01)) {
         tx = tx.prepend(client.refresh());
     }
     return {

package/dist/utils/numberUtils.d.ts

@@ -1,3 +1,4 @@
+import { FeeType } from "../generated";
 export declare function getLiqUtilzationRateBps(supplyUsd: number, debtUsd: number, liqThresholdBps: number): number;
 export declare function toBaseUnit(value: number, decimals: number): bigint;
 export declare function fromBaseUnit(value: bigint, decimals: number): number;
@@ -6,7 +7,13 @@ export declare function toBps(value: number): number;
 export declare function bytesToI80F48(bytes: number[]): number;
 export declare function uint8ArrayToBigInt(uint8Array: Uint8Array): bigint;
 export declare function getDebtAdjustmentUsd(liqThresholdBps: number, supplyUsd: number, debtUsd: number, targetLiqUtilizationRateBps: number, adjustmentFeeBps?: number): number;
-export declare function getMaxLiqUtilizationRateBps(maxLtvBps: number, liqThresholdBps: number): number;
+export declare function getSolautoFeesBps(isReferred: boolean, feeType: FeeType, positionNetWorthUsd: number): {
+    solauto: number;
+    referrer: number;
+    total: number;
+};
+export declare function getMaxLiqUtilizationRateBps(maxLtvBps: number, liqThresholdBps: number, offsetFromMaxLtv: number): number;
+export declare function maxBoostToBps(maxLtvBps: number, liqThresholdBps: number): number;
 export declare function maxRepayFromBps(maxLtvBps: number, liqThresholdBps: number): number;
 export declare function maxRepayToBps(maxLtvBps: number, liqThresholdBps: number): number;
 //# sourceMappingURL=numberUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAM3G;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAajE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAQ1B;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,MAAM,CAER;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}
+{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAejE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAW1B;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,OAAO,EAChB,mBAAmB,EAAE,MAAM,GAC1B;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CA8BA;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAER;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAEvE;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}

package/dist/utils/numberUtils.js

@@ -8,10 +8,13 @@ exports.toBps = toBps;
 exports.bytesToI80F48 = bytesToI80F48;
 exports.uint8ArrayToBigInt = uint8ArrayToBigInt;
 exports.getDebtAdjustmentUsd = getDebtAdjustmentUsd;
+exports.getSolautoFeesBps = getSolautoFeesBps;
 exports.getMaxLiqUtilizationRateBps = getMaxLiqUtilizationRateBps;
+exports.maxBoostToBps = maxBoostToBps;
 exports.maxRepayFromBps = maxRepayFromBps;
 exports.maxRepayToBps = maxRepayToBps;
 const constants_1 = require("../constants");
+const generated_1 = require("../generated");
 function getLiqUtilzationRateBps(supplyUsd, debtUsd, liqThresholdBps) {
     if (supplyUsd === 0) {
         return 0;
@@ -32,7 +35,7 @@ function toBps(value) {
 }
 function bytesToI80F48(bytes) {
     if (bytes.length !== 16) {
-        throw new Error('Byte array must be exactly 16 bytes.');
+        throw new Error("Byte array must be exactly 16 bytes.");
     }
     const reversedBytes = bytes.slice().reverse();
     let integerPart = BigInt(0);
@@ -44,31 +47,65 @@ function bytesToI80F48(bytes) {
         fractionalPart = (fractionalPart << 8n) | BigInt(reversedBytes[i]);
     }
     const fullValue = integerPart * BigInt(2 ** 48) + fractionalPart;
-    return Number(fullValue) / (2 ** 48);
+    return Number(fullValue) / 2 ** 48;
 }
 function uint8ArrayToBigInt(uint8Array) {
     if (uint8Array.length !== 8) {
-        throw new Error('Uint8Array must be exactly 8 bytes long to convert to u64.');
+        throw new Error("Uint8Array must be exactly 8 bytes long to convert to u64.");
     }
     const buffer = uint8Array.buffer;
     const dataView = new DataView(buffer);
     const low = dataView.getUint32(0, true);
     const high = dataView.getUint32(4, true);
-    return BigInt(high) << 32n | BigInt(low);
+    return (BigInt(high) << 32n) | BigInt(low);
 }
 function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtilizationRateBps, adjustmentFeeBps) {
     const adjustmentFee = adjustmentFeeBps && adjustmentFeeBps > 0 ? fromBps(adjustmentFeeBps) : 0;
     const liqThreshold = fromBps(liqThresholdBps);
     const targetLiqUtilizationRate = fromBps(targetLiqUtilizationRateBps);
-    const debtAdjustmentUsd = (targetLiqUtilizationRate * supplyUsd * liqThreshold - debtUsd) / (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
+    const debtAdjustmentUsd = (targetLiqUtilizationRate * supplyUsd * liqThreshold - debtUsd) /
+        (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
     return debtAdjustmentUsd;
 }
-function getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps) {
-    return toBps((fromBps(maxLtvBps) - 0.015) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
+function getSolautoFeesBps(isReferred, feeType, positionNetWorthUsd) {
+    const minSize = 10000; // Minimum position size
+    const maxSize = 1000000; // Maximum position size
+    const maxFeeBps = 500; // Fee in basis points for minSize (5%)
+    const minFeeBps = 100; // Fee in basis points for maxSize (1%)
+    let feeBps = 0;
+    if (feeType === generated_1.FeeType.Small) {
+        feeBps = 100;
+    }
+    else if (positionNetWorthUsd <= minSize) {
+        feeBps = maxFeeBps;
+    }
+    else if (positionNetWorthUsd >= maxSize) {
+        feeBps = minFeeBps;
+    }
+    else {
+        const t = (Math.log(positionNetWorthUsd) - Math.log(minSize)) /
+            (Math.log(maxSize) - Math.log(minSize));
+        feeBps = Math.round(minFeeBps + (maxFeeBps - minFeeBps) * (1 - t));
+    }
+    let referrer = 0;
+    if (isReferred) {
+        referrer = Math.floor(feeBps / 4);
+    }
+    return {
+        solauto: feeBps - referrer,
+        referrer,
+        total: feeBps,
+    };
+}
+function getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, offsetFromMaxLtv) {
+    return toBps((fromBps(maxLtvBps) - offsetFromMaxLtv) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
+}
+function maxBoostToBps(maxLtvBps, liqThresholdBps) {
+    return getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, 0.015);
 }
 function maxRepayFromBps(maxLtvBps, liqThresholdBps) {
-    return Math.min(9000, getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps - 1000));
+    return Math.min(9000, getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps - 1000, 0.005));
 }
 function maxRepayToBps(maxLtvBps, liqThresholdBps) {
-    return Math.min(maxRepayFromBps(maxLtvBps, liqThresholdBps) - constants_1.MAX_REPAY_GAP_BPS, getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps));
+    return Math.min(maxRepayFromBps(maxLtvBps, liqThresholdBps) - constants_1.MAX_REPAY_GAP_BPS, getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, 0.005));
 }

package/dist/utils/solauto/generalUtils.d.ts

@@ -1,17 +1,12 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
-import { AutomationSettings, DCASettings, DCASettingsInpArgs, FeeType, PositionState, SolautoSettingsParameters, SolautoSettingsParametersInpArgs } from "../../generated";
+import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, SolautoSettingsParameters, SolautoSettingsParametersInpArgs } from "../../generated";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
 export declare function nextAutomationPeriodTimestamp(automation: AutomationSettings): number;
 export declare function eligibleForNextAutomationPeriod(automation: AutomationSettings, currentUnixTime: number): boolean;
 export declare function getUpdatedValueFromAutomation(currValue: number, targetValue: number, automation: AutomationSettings, currentUnixTimestamp: number): number;
 export declare function getAdjustedSettingsFromAutomation(settings: SolautoSettingsParameters, currentUnixTime: number): SolautoSettingsParameters;
-export declare function getSolautoFeesBps(isReferred: boolean, feeType: FeeType): {
-    solauto: number;
-    referrer: number;
-    total: number;
-};
-export declare function eligibleForRebalance(positionState: PositionState, positionSettings: SolautoSettingsParameters, positionDca: DCASettings | undefined, currentUnixSecs: number): RebalanceAction | undefined;
+export declare function eligibleForRebalance(positionState: PositionState, positionSettings: SolautoSettingsParameters, positionDca: DCASettings | undefined, currentUnixTime: number): RebalanceAction | undefined;
 export declare function eligibleForRefresh(positionState: PositionState, positionSettings: SolautoSettingsParameters, currentUnixTime: number): boolean;
 export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey): Promise<SolautoPositionDetails[]>;
 export declare function getAllReferralStates(umi: Umi): Promise<PublicKey[]>;

package/dist/utils/solauto/generalUtils.d.ts.map

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

package/dist/utils/solauto/generalUtils.js

@@ -5,7 +5,6 @@ exports.nextAutomationPeriodTimestamp = nextAutomationPeriodTimestamp;
 exports.eligibleForNextAutomationPeriod = eligibleForNextAutomationPeriod;
 exports.getUpdatedValueFromAutomation = getUpdatedValueFromAutomation;
 exports.getAdjustedSettingsFromAutomation = getAdjustedSettingsFromAutomation;
-exports.getSolautoFeesBps = getSolautoFeesBps;
 exports.eligibleForRebalance = eligibleForRebalance;
 exports.eligibleForRefresh = eligibleForRefresh;
 exports.getSolautoManagedPositions = getSolautoManagedPositions;
@@ -55,30 +54,18 @@ function getAdjustedSettingsFromAutomation(settings, currentUnixTime) {
         boostToBps,
     };
 }
-function getSolautoFeesBps(isReferred, feeType) {
-    const fees = feeType === generated_1.FeeType.Small ? 100 : 500;
-    let referrer = 0;
-    if (isReferred) {
-        referrer = fees / 4;
-    }
-    return {
-        solauto: fees - referrer,
-        referrer,
-        total: fees,
-    };
-}
-function eligibleForRebalance(positionState, positionSettings, positionDca, currentUnixSecs) {
+function eligibleForRebalance(positionState, positionSettings, positionDca, currentUnixTime) {
     if (positionDca &&
         positionDca.automation.targetPeriods > 0 &&
-        eligibleForNextAutomationPeriod(positionDca.automation, currentUnixSecs)) {
+        eligibleForNextAutomationPeriod(positionDca.automation, currentUnixTime)) {
         return "dca";
     }
     if (positionState.supply.amountUsed.baseUnit === BigInt(0)) {
         return undefined;
     }
-    const boostToBps = eligibleForRefresh(positionState, positionSettings, currentUnixSecs) &&
+    const boostToBps = eligibleForRefresh(positionState, positionSettings, currentUnixTime) &&
         positionSettings.automation.targetPeriods > 0
-        ? getUpdatedValueFromAutomation(positionSettings.boostToBps, positionSettings.targetBoostToBps, positionSettings.automation, currentUnixSecs)
+        ? getUpdatedValueFromAutomation(positionSettings.boostToBps, positionSettings.targetBoostToBps, positionSettings.automation, currentUnixTime)
         : positionSettings.boostToBps;
     const repayFrom = positionSettings.repayToBps + positionSettings.repayGap;
     const boostFrom = boostToBps - positionSettings.boostGap;

package/dist/utils/solauto/rebalanceUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,OAAO,EACP,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAiJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAsEjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAkE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,OAAO,EACP,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAkJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CA0EjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -19,8 +19,8 @@ function getAdditionalAmountToDcaIn(dca) {
 }
 function getStandardTargetLiqUtilizationRateBps(state, settings) {
     const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(settings, (0, generalUtils_2.currentUnixSeconds)());
-    const repayFrom = adjustedSettings.repayToBps + adjustedSettings.repayGap;
-    const boostFrom = adjustedSettings.boostToBps - adjustedSettings.boostGap;
+    const repayFrom = settings.repayToBps + settings.repayGap;
+    const boostFrom = adjustedSettings.boostToBps - settings.boostGap;
     if (state.liqUtilizationRateBps < boostFrom) {
         return adjustedSettings.boostToBps;
     }
@@ -63,7 +63,7 @@ function getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, target
         };
     }
     if (settings === undefined) {
-        throw new Error("If rebalancing a self-managed position, settings, and DCA should be provided");
+        throw new Error("If rebalancing a self-managed position, settings and DCA should be provided");
     }
     if (isDcaRebalance(state, settings, dca, currentUnixTime)) {
         const amountToDcaIn = getAdditionalAmountToDcaIn(dca);
@@ -91,7 +91,7 @@ function getRebalanceValues(state, settings, dca, feeType, currentUnixTime, supp
     const increasingLeverage = amountUsdToDcaIn > 0 || state.liqUtilizationRateBps < targetRateBps;
     let adjustmentFeeBps = 0;
     if (increasingLeverage) {
-        adjustmentFeeBps = (0, generalUtils_1.getSolautoFeesBps)(false, feeType).total;
+        adjustmentFeeBps = (0, numberUtils_1.getSolautoFeesBps)(false, feeType, (0, numberUtils_1.fromBaseUnit)(state.netWorth.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS)).total;
     }
     const supplyUsd = (0, numberUtils_1.fromBaseUnit)(state.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) +
         amountUsdToDcaIn;
@@ -133,7 +133,7 @@ function getFlashLoanDetails(client, values, jupQuote) {
     const tempLiqUtilizationRateBps = (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, client.solautoPositionState.liqThresholdBps);
     const requiresFlashLoan = supplyUsd <= 0 ||
         tempLiqUtilizationRateBps >
-            (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps);
+            (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.01);
     let flashLoanToken = undefined;
     let flashLoanTokenPrice = 0;
     if (values.increasingLeverage) {

package/package.json

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

package/src/transactions/transactionUtils.ts

@@ -1,6 +1,5 @@
 import {
   Instruction,
-  Signer,
   TransactionBuilder,
   Umi,
   publicKey,
@@ -14,7 +13,6 @@ import {
   Account as SplTokenAccount,
 } from "@solana/spl-token";
 import {
-  FeeType,
   LendingPlatform,
   ReferralState,
   SOLAUTO_PROGRAM_ID,
@@ -582,7 +580,7 @@ export async function buildSolautoRebalanceTransaction(
     client.solautoPositionState!,
     client.solautoPositionSettings(),
     client.solautoPositionActiveDca(),
-    client.solautoPositionData?.feeType ?? FeeType.Small,
+    client.solautoPositionData!.feeType,
     currentUnixSeconds(),
     PRICES[client.supplyMint.toString()].price,
     PRICES[client.debtMint.toString()].price,
@@ -672,7 +670,8 @@ export async function buildSolautoRebalanceTransaction(
     client.solautoPositionState!.liqUtilizationRateBps >
     getMaxLiqUtilizationRateBps(
       client.solautoPositionState!.maxLtvBps,
-      client.solautoPositionState!.liqThresholdBps
+      client.solautoPositionState!.liqThresholdBps,
+      0.01
     )
   ) {
     tx = tx.prepend(client.refresh());

package/src/utils/numberUtils.ts

@@ -1,17 +1,22 @@
 import { MAX_REPAY_GAP_BPS } from "../constants";
+import { FeeType } from "../generated";
 
-export function getLiqUtilzationRateBps(supplyUsd: number, debtUsd: number, liqThresholdBps: number): number {
+export function getLiqUtilzationRateBps(
+  supplyUsd: number,
+  debtUsd: number,
+  liqThresholdBps: number
+): number {
   if (supplyUsd === 0) {
     return 0;
   }
-  
+
   return toBps(debtUsd / (supplyUsd * fromBps(liqThresholdBps)));
 }
 
 export function toBaseUnit(value: number, decimals: number): bigint {
-    return BigInt(Math.round(value * Math.pow(10, decimals)));
-  }
-  
+  return BigInt(Math.round(value * Math.pow(10, decimals)));
+}
+
 export function fromBaseUnit(value: bigint, decimals: number): number {
   return Number(value) / Math.pow(10, decimals);
 }
@@ -26,7 +31,7 @@ export function toBps(value: number): number {
 
 export function bytesToI80F48(bytes: number[]): number {
   if (bytes.length !== 16) {
-    throw new Error('Byte array must be exactly 16 bytes.');
+    throw new Error("Byte array must be exactly 16 bytes.");
   }
 
   const reversedBytes = bytes.slice().reverse();
@@ -44,12 +49,14 @@ export function bytesToI80F48(bytes: number[]): number {
 
   const fullValue = integerPart * BigInt(2 ** 48) + fractionalPart;
 
-  return Number(fullValue) / (2 ** 48);
+  return Number(fullValue) / 2 ** 48;
 }
 
 export function uint8ArrayToBigInt(uint8Array: Uint8Array): bigint {
   if (uint8Array.length !== 8) {
-    throw new Error('Uint8Array must be exactly 8 bytes long to convert to u64.');
+    throw new Error(
+      "Uint8Array must be exactly 8 bytes long to convert to u64."
+    );
   }
 
   const buffer = uint8Array.buffer;
@@ -59,7 +66,7 @@ export function uint8ArrayToBigInt(uint8Array: Uint8Array): bigint {
   const low = dataView.getUint32(0, true);
   const high = dataView.getUint32(4, true);
 
-  return BigInt(high) << 32n | BigInt(low);
+  return (BigInt(high) << 32n) | BigInt(low);
 }
 
 export function getDebtAdjustmentUsd(
@@ -69,31 +76,79 @@ export function getDebtAdjustmentUsd(
   targetLiqUtilizationRateBps: number,
   adjustmentFeeBps?: number
 ) {
-  const adjustmentFee = adjustmentFeeBps && adjustmentFeeBps > 0 ? fromBps(adjustmentFeeBps) : 0;
+  const adjustmentFee =
+    adjustmentFeeBps && adjustmentFeeBps > 0 ? fromBps(adjustmentFeeBps) : 0;
   const liqThreshold = fromBps(liqThresholdBps);
   const targetLiqUtilizationRate = fromBps(targetLiqUtilizationRateBps);
 
-  const debtAdjustmentUsd = (targetLiqUtilizationRate * supplyUsd * liqThreshold - debtUsd) / (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
+  const debtAdjustmentUsd =
+    (targetLiqUtilizationRate * supplyUsd * liqThreshold - debtUsd) /
+    (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
   return debtAdjustmentUsd;
 }
 
+export function getSolautoFeesBps(
+  isReferred: boolean,
+  feeType: FeeType,
+  positionNetWorthUsd: number
+): {
+  solauto: number;
+  referrer: number;
+  total: number;
+} {
+  const minSize = 10000; // Minimum position size
+  const maxSize = 1000000; // Maximum position size
+  const maxFeeBps = 500; // Fee in basis points for minSize (5%)
+  const minFeeBps = 100; // Fee in basis points for maxSize (1%)
+
+  let feeBps: number = 0;
+  if (feeType === FeeType.Small) {
+    feeBps = 100;
+  } else if (positionNetWorthUsd <= minSize) {
+    feeBps = maxFeeBps;
+  } else if (positionNetWorthUsd >= maxSize) {
+    feeBps = minFeeBps;
+  } else {
+    const t =
+      (Math.log(positionNetWorthUsd) - Math.log(minSize)) /
+      (Math.log(maxSize) - Math.log(minSize));
+    feeBps = Math.round(minFeeBps + (maxFeeBps - minFeeBps) * (1 - t));
+  }
+
+  let referrer = 0;
+  if (isReferred) {
+    referrer = Math.floor(feeBps / 4);
+  }
+
+  return {
+    solauto: feeBps - referrer,
+    referrer,
+    total: feeBps,
+  };
+}
+
 export function getMaxLiqUtilizationRateBps(
   maxLtvBps: number,
-  liqThresholdBps: number
+  liqThresholdBps: number,
+  offsetFromMaxLtv: number
 ): number {
-  return toBps((fromBps(maxLtvBps) - 0.015) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
+  return toBps((fromBps(maxLtvBps) - offsetFromMaxLtv) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
+}
+
+export function maxBoostToBps(maxLtvBps: number, liqThresholdBps: number) {
+  return getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, 0.015);
 }
 
 export function maxRepayFromBps(maxLtvBps: number, liqThresholdBps: number) {
   return Math.min(
     9000,
-    getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps - 1000)
+    getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps - 1000, 0.005)
   );
 }
 
 export function maxRepayToBps(maxLtvBps: number, liqThresholdBps: number) {
   return Math.min(
     maxRepayFromBps(maxLtvBps, liqThresholdBps) - MAX_REPAY_GAP_BPS,
-    getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps)
+    getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, 0.005)
   );
-}
+}

package/src/utils/solauto/generalUtils.ts

@@ -4,7 +4,6 @@ import {
   AutomationSettings,
   DCASettings,
   DCASettingsInpArgs,
-  FeeType,
   LendingPlatform,
   PositionState,
   SOLAUTO_PROGRAM_ID,
@@ -29,7 +28,6 @@ import {
 } from "../../constants";
 import {
   getAllMarginfiAccountsByAuthority,
-  getMarginfiAccountPositionState,
 } from "../marginfiUtils";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
 
@@ -102,37 +100,16 @@ export function getAdjustedSettingsFromAutomation(
   };
 }
 
-export function getSolautoFeesBps(
-  isReferred: boolean,
-  feeType: FeeType
-): {
-  solauto: number;
-  referrer: number;
-  total: number;
-} {
-  const fees = feeType === FeeType.Small ? 100 : 500;
-  let referrer = 0;
-  if (isReferred) {
-    referrer = fees / 4;
-  }
-
-  return {
-    solauto: fees - referrer,
-    referrer,
-    total: fees,
-  };
-}
-
 export function eligibleForRebalance(
   positionState: PositionState,
   positionSettings: SolautoSettingsParameters,
   positionDca: DCASettings | undefined,
-  currentUnixSecs: number
+  currentUnixTime: number
 ): RebalanceAction | undefined {
   if (
     positionDca &&
     positionDca.automation.targetPeriods > 0 &&
-    eligibleForNextAutomationPeriod(positionDca.automation, currentUnixSecs)
+    eligibleForNextAutomationPeriod(positionDca.automation, currentUnixTime)
   ) {
     return "dca";
   }
@@ -142,13 +119,13 @@ export function eligibleForRebalance(
   }
 
   const boostToBps =
-    eligibleForRefresh(positionState, positionSettings, currentUnixSecs) &&
+    eligibleForRefresh(positionState, positionSettings, currentUnixTime) &&
     positionSettings.automation.targetPeriods > 0
       ? getUpdatedValueFromAutomation(
           positionSettings.boostToBps,
           positionSettings.targetBoostToBps,
           positionSettings.automation,
-          currentUnixSecs
+          currentUnixTime
         )
       : positionSettings.boostToBps;
   const repayFrom = positionSettings.repayToBps + positionSettings.repayGap;

package/src/utils/solauto/rebalanceUtils.ts

@@ -10,7 +10,6 @@ import {
 import {
   eligibleForNextAutomationPeriod,
   getAdjustedSettingsFromAutomation,
-  getSolautoFeesBps,
   getUpdatedValueFromAutomation,
 } from "./generalUtils";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
@@ -23,6 +22,7 @@ import {
   getDebtAdjustmentUsd,
   getLiqUtilzationRateBps,
   getMaxLiqUtilizationRateBps,
+  getSolautoFeesBps,
   toBaseUnit,
 } from "../numberUtils";
 import { USD_DECIMALS } from "../../constants/generalAccounts";
@@ -57,8 +57,8 @@ function getStandardTargetLiqUtilizationRateBps(
     currentUnixSeconds()
   );
 
-  const repayFrom = adjustedSettings.repayToBps + adjustedSettings.repayGap;
-  const boostFrom = adjustedSettings.boostToBps - adjustedSettings.boostGap;
+  const repayFrom = settings.repayToBps + settings.repayGap;
+  const boostFrom = adjustedSettings.boostToBps - settings.boostGap;
 
   if (state.liqUtilizationRateBps < boostFrom) {
     return adjustedSettings.boostToBps;
@@ -136,7 +136,7 @@ function getTargetRateAndDcaAmount(
 
   if (settings === undefined) {
     throw new Error(
-      "If rebalancing a self-managed position, settings, and DCA should be provided"
+      "If rebalancing a self-managed position, settings and DCA should be provided"
     );
   }
 
@@ -204,7 +204,11 @@ export function getRebalanceValues(
     amountUsdToDcaIn > 0 || state.liqUtilizationRateBps < targetRateBps;
   let adjustmentFeeBps = 0;
   if (increasingLeverage) {
-    adjustmentFeeBps = getSolautoFeesBps(false, feeType).total;
+    adjustmentFeeBps = getSolautoFeesBps(
+      false,
+      feeType,
+      fromBaseUnit(state.netWorth.baseAmountUsdValue, USD_DECIMALS)
+    ).total;
   }
 
   const supplyUsd =
@@ -290,7 +294,8 @@ export function getFlashLoanDetails(
     tempLiqUtilizationRateBps >
       getMaxLiqUtilizationRateBps(
         client.solautoPositionState!.maxLtvBps,
-        client.solautoPositionState!.liqThresholdBps
+        client.solautoPositionState!.liqThresholdBps,
+        0.01
       );
 
   let flashLoanToken: PositionTokenUsage | undefined = undefined;

package/tests/transactions/solautoMarginfi.ts

@@ -5,12 +5,11 @@ import {
   SolautoMarginfiClient,
 } from "../../src/clients/solautoMarginfiClient";
 import {
-  LendingPlatform,
   solautoAction,
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
-import { getMaxLiqUtilizationRateBps, toBaseUnit } from "../../src/utils/numberUtils";
+import { maxBoostToBps, maxRepayFromBps, maxRepayToBps, toBaseUnit } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { getTokenPrices } from "../../src/utils/generalUtils";
 import {
@@ -21,12 +20,12 @@ import { PublicKey } from "@solana/web3.js";
 import { USDC_MINT } from "../../src/constants";
 
 describe("Solauto Marginfi tests", async () => {
-  // const signer = setupTest();
-  const signer = setupTest("solauto-manager");
+  const signer = setupTest();
+  // 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(process.env.HELIUS_API_KEY!, true);
@@ -67,22 +66,26 @@ describe("Solauto Marginfi tests", async () => {
     //     }, "open position")
     //   );
 
-    //   const initialSupplyUsd = 50;
-    //   transactionItems.push(
-    //     new TransactionItem(async () => {
-    //       const [supplyPrice] = await getTokenPrices([supply]);
-    //       return {
-    //         tx: client.protocolInteraction(
-    //           solautoAction("Deposit", [
-    //             toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
-    //           ])
-    //         ),
-    //       };
-    //     }, "deposit")
-    //   );
+      // const initialSupplyUsd = 150;
+      // transactionItems.push(
+      //   new TransactionItem(async () => {
+      //     const [supplyPrice] = await getTokenPrices([supply]);
+      //     return {
+      //       tx: client.protocolInteraction(
+      //         solautoAction("Deposit", [
+      //           toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
+      //         ])
+      //       ),
+      //     };
+      //   }, "deposit")
+      // );
     // }
 
-    // const maxLiqRate = getMaxLiqUtilizationRateBps(client.solautoPositionState!.maxLtvBps, client.solautoPositionState!.liqThresholdBps);
+    // const maxLtvBps = client.solautoPositionState!.maxLtvBps;
+    // const liqThresholdBps = client.solautoPositionState!.liqThresholdBps;
+    // const maxRepayFrom = maxRepayFromBps(maxLtvBps, liqThresholdBps);
+    // const maxRepayTo = maxRepayToBps(maxLtvBps, liqThresholdBps);
+    // const maxBoostTo = maxBoostToBps(maxLtvBps, liqThresholdBps);
     // transactionItems.push(
     //   new TransactionItem(
     //     async () => ({
@@ -90,10 +93,10 @@ describe("Solauto Marginfi tests", async () => {
     //         positionId: client.positionId,
     //         settingParams: some({
     //           ...settingParams,
+    //           boostToBps: maxBoostTo,
     //           boostGap: 50,
-    //           boostToBps: maxLiqRate,
-    //           repayGap: 100,
-    //           repayToBps: maxLiqRate
+    //           repayToBps: maxRepayTo,
+    //           repayGap: maxRepayFrom - maxRepayTo
     //         }),
     //         dca: null,
     //       }),

package/tests/unit/rebalanceCalculations.ts

@@ -18,6 +18,7 @@ import {
   fromBaseUnit,
   fromBps,
   getLiqUtilzationRateBps,
+  getSolautoFeesBps,
   toBaseUnit,
 } from "../../src/utils/numberUtils";
 import { USD_DECIMALS } from "../../src/constants/generalAccounts";
@@ -25,7 +26,6 @@ import {
   createFakePositionState,
   eligibleForNextAutomationPeriod,
   getAdjustedSettingsFromAutomation,
-  getSolautoFeesBps,
   getUpdatedValueFromAutomation,
   positionStateWithLatestPrices,
 } from "../../src/utils/solauto/generalUtils";
@@ -49,7 +49,7 @@ function assertAccurateRebalance(
       client.solautoPositionState!,
       client.solautoPositionSettings(),
       client.solautoPositionActiveDca(),
-      client.solautoPositionData?.feeType ?? FeeType.Small,
+      client.solautoPositionData!.feeType,
       currentUnixSeconds(),
       PRICES[client.supplyMint.toString()].price,
       PRICES[client.debtMint.toString()].price,
@@ -60,7 +60,11 @@ function assertAccurateRebalance(
   if (increasingLeverage) {
     adjustmentFeeBps = getSolautoFeesBps(
       client.referredByState !== undefined,
-      client.solautoPositionData!.feeType
+      client.solautoPositionData!.feeType,
+      fromBaseUnit(
+        client.solautoPositionState?.netWorth.baseAmountUsdValue ?? BigInt(0),
+        USD_DECIMALS
+      )
     ).total;
   }
 
@@ -285,28 +289,28 @@ describe("Rebalance tests", async () => {
     ]);
   });
 
-  // it("Standard rebalance with target rate", async () => {
-  //   const client = await getFakePosition(supplyPrice, debtPrice, 3450, {
-  //     boostToBps: 500,
-  //     boostGap: 100,
-  //     repayToBps: 7000,
-  //     repayGap: 250,
-  //     automation: {
-  //       targetPeriods: 0,
-  //       periodsPassed: 0,
-  //       unixStartDate: BigInt(0),
-  //       intervalSeconds: BigInt(0),
-  //       padding1: [],
-  //       padding: new Uint8Array([]),
-  //     },
-  //     targetBoostToBps: 0,
-  //     padding1: [],
-  //     padding: new Uint8Array([]),
-  //   });
+  it("Standard rebalance with target rate", async () => {
+    const client = await getFakePosition(supplyPrice, debtPrice, 3450, {
+      boostToBps: 500,
+      boostGap: 100,
+      repayToBps: 7000,
+      repayGap: 250,
+      automation: {
+        targetPeriods: 0,
+        periodsPassed: 0,
+        unixStartDate: BigInt(0),
+        intervalSeconds: BigInt(0),
+        padding1: [],
+        padding: new Uint8Array([]),
+      },
+      targetBoostToBps: 0,
+      padding1: [],
+      padding: new Uint8Array([]),
+    });
 
-  //   assertAccurateRebalance(client, 5000, 5000);
-  //   assertAccurateRebalance(client, 1000, 1000);
-  // });
+    assertAccurateRebalance(client, 5000, 5000);
+    assertAccurateRebalance(client, 1000, 1000);
+  });
 
   it("Standard boost or repay", async () => {
     const settings: SolautoSettingsParameters = {