@haven-fi/solauto-sdk 1.0.59 → 1.0.61

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,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAsMzD,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;AAGD,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,CAiHA;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,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"}

package/dist/transactions/transactionUtils.js

@@ -17,6 +17,7 @@ const numberUtils_1 = require("../utils/numberUtils");
 const generalUtils_2 = require("../utils/solauto/generalUtils");
 const accountUtils_1 = require("../utils/accountUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
+const constants_1 = require("../constants");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
     const supplyIsWsol = client.supplyMint.equals(spl_token_1.NATIVE_MINT);
     const debtIsWsol = client.debtMint.equals(spl_token_1.NATIVE_MINT);
@@ -328,7 +329,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         client.log("Not eligible for a rebalance");
         return undefined;
     }
-    const values = (0, rebalanceUtils_1.getRebalanceValues)(client, targetLiqUtilizationRateBps);
+    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);
     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);

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

@@ -3,21 +3,35 @@ import { Umi } from "@metaplex-foundation/umi";
 import { AutomationSettings, DCASettings, DCASettingsInpArgs, FeeType, LendingPlatform, PositionState, SolautoSettingsParameters, SolautoSettingsParametersInpArgs } from "../../generated";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
 export declare function nextAutomationPeriodTimestamp(automation: AutomationSettings): number;
-export declare function eligibleForNextAutomationPeriod(automation: AutomationSettings, currentUnixSecs?: number): boolean;
+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, currentUnixSecs?: number): SolautoSettingsParameters;
+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, currentUnixSecs: number): RebalanceAction | undefined;
-export declare function eligibleForRefresh(positionState: PositionState, positionSettings: SolautoSettingsParameters, currentUnixSecs?: number): boolean;
+export declare function eligibleForRebalance(positionState: PositionState, positionSettings: SolautoSettingsParameters, positionDca: DCASettings | undefined, currentUnixSecs: 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[]>;
 export declare function getReferralsByUser(umi: Umi, user: PublicKey): Promise<PublicKey[]>;
 export declare function getAllPositionsByAuthority(umi: Umi, user: PublicKey): Promise<SolautoPositionDetails[]>;
-export declare function positionStateWithPrices(umi: Umi, state: PositionState, protocolAccount: PublicKey, lendingPlatform: LendingPlatform, supplyPrice?: number, debtPrice?: number): Promise<PositionState | undefined>;
+export declare function positionStateWithPrices({ state, supplyPrice, debtPrice, umi, protocolAccount, lendingPlatform, }: {
+    state: PositionState;
+    umi?: Umi;
+    protocolAccount?: PublicKey;
+    lendingPlatform?: LendingPlatform;
+    supplyPrice?: number;
+    debtPrice?: number;
+}): Promise<PositionState | undefined>;
+interface AssetProps {
+    amountUsedBaseUnit: bigint;
+    decimals: number;
+    price: number;
+    mint: PublicKey;
+}
+export declare function createFakePositionState(supply: AssetProps, debt: AssetProps, maxLtvBps: number, liqThresholdBps: number): PositionState;
 type PositionAdjustment = {
     type: "supply";
     value: bigint;

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

@@ -13,6 +13,7 @@ exports.getAllReferralStates = getAllReferralStates;
 exports.getReferralsByUser = getReferralsByUser;
 exports.getAllPositionsByAuthority = getAllPositionsByAuthority;
 exports.positionStateWithPrices = positionStateWithPrices;
+exports.createFakePositionState = createFakePositionState;
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const generated_1 = require("../../generated");
@@ -33,8 +34,8 @@ function nextAutomationPeriodTimestamp(automation) {
         : Number(automation.unixStartDate) +
             automation.periodsPassed * Number(automation.intervalSeconds);
 }
-function eligibleForNextAutomationPeriod(automation, currentUnixSecs) {
-    return (currentUnixSecs ?? (0, generalUtils_1.currentUnixSeconds)()) >= nextAutomationPeriodTimestamp(automation);
+function eligibleForNextAutomationPeriod(automation, currentUnixTime) {
+    return currentUnixTime >= nextAutomationPeriodTimestamp(automation);
 }
 function getUpdatedValueFromAutomation(currValue, targetValue, automation, currentUnixTimestamp) {
     const currRateDiff = currValue - targetValue;
@@ -44,10 +45,10 @@ function getUpdatedValueFromAutomation(currValue, targetValue, automation, curre
     const newValue = currValue - currRateDiff * progressPct;
     return newValue;
 }
-function getAdjustedSettingsFromAutomation(settings, currentUnixSecs) {
+function getAdjustedSettingsFromAutomation(settings, currentUnixTime) {
     const boostToBps = settings.automation.targetPeriods > 0 &&
-        eligibleForNextAutomationPeriod(settings.automation, currentUnixSecs)
-        ? getUpdatedValueFromAutomation(settings.boostToBps, settings.targetBoostToBps, settings.automation, currentUnixSecs ?? (0, generalUtils_1.currentUnixSeconds)())
+        eligibleForNextAutomationPeriod(settings.automation, currentUnixTime)
+        ? getUpdatedValueFromAutomation(settings.boostToBps, settings.targetBoostToBps, settings.automation, currentUnixTime)
         : settings.boostToBps;
     return {
         ...settings,
@@ -67,7 +68,8 @@ function getSolautoFeesBps(isReferred, feeType) {
     };
 }
 function eligibleForRebalance(positionState, positionSettings, positionDca, currentUnixSecs) {
-    if (positionDca.automation.targetPeriods > 0 &&
+    if (positionDca &&
+        positionDca.automation.targetPeriods > 0 &&
         eligibleForNextAutomationPeriod(positionDca.automation, currentUnixSecs)) {
         return "dca";
     }
@@ -88,9 +90,9 @@ function eligibleForRebalance(positionState, positionSettings, positionDca, curr
     }
     return undefined;
 }
-function eligibleForRefresh(positionState, positionSettings, currentUnixSecs) {
+function eligibleForRefresh(positionState, positionSettings, currentUnixTime) {
     if (positionSettings.automation.targetPeriods > 0) {
-        return eligibleForNextAutomationPeriod(positionSettings.automation, currentUnixSecs);
+        return eligibleForNextAutomationPeriod(positionSettings.automation, currentUnixTime);
     }
     else {
         return ((0, generalUtils_1.currentUnixSeconds)() - Number(positionState.lastUpdated) >
@@ -211,8 +213,13 @@ async function getAllPositionsByAuthority(umi, user) {
     // TODO support other platforms
     return allPositions;
 }
-async function positionStateWithPrices(umi, state, protocolAccount, lendingPlatform, supplyPrice, debtPrice) {
+async function positionStateWithPrices({ state, supplyPrice, debtPrice, umi, protocolAccount, lendingPlatform, }) {
     if ((0, generalUtils_1.currentUnixSeconds)() - Number(state.lastUpdated) > 60 * 60 * 24 * 7) {
+        if (umi === undefined ||
+            protocolAccount === undefined ||
+            lendingPlatform === undefined) {
+            throw new Error("Missing required parameters");
+        }
         if (lendingPlatform === generated_1.LendingPlatform.Marginfi) {
             return await (0, marginfiUtils_1.getMarginfiAccountPositionState)(umi, protocolAccount, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint));
         }
@@ -234,7 +241,7 @@ async function positionStateWithPrices(umi, state, protocolAccount, lendingPlatf
         ...state,
         liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, state.liqThresholdBps),
         netWorth: {
-            ...state.netWorth,
+            baseUnit: (0, numberUtils_1.toBaseUnit)((supplyUsd - debtUsd) / supplyPrice, state.supply.decimals),
             baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd - debtUsd, constants_1.USD_DECIMALS),
         },
         supply: {
@@ -253,6 +260,59 @@ async function positionStateWithPrices(umi, state, protocolAccount, lendingPlatf
         },
     };
 }
+function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
+    const supplyUsd = (0, numberUtils_1.fromBaseUnit)(supply.amountUsedBaseUnit, supply.decimals) * supply.price;
+    const debtUsd = (0, numberUtils_1.fromBaseUnit)(debt.amountUsedBaseUnit, debt.decimals) * debt.price;
+    return {
+        liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, liqThresholdBps),
+        supply: {
+            amountUsed: {
+                baseUnit: supply.amountUsedBaseUnit,
+                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd, constants_1.USD_DECIMALS),
+            },
+            amountCanBeUsed: {
+                baseUnit: (0, numberUtils_1.toBaseUnit)(1000000, supply.decimals),
+                baseAmountUsdValue: BigInt(Math.round(1000000 * supply.price)),
+            },
+            baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(supply.price, constants_1.USD_DECIMALS),
+            borrowFeeBps: 0,
+            decimals: supply.decimals,
+            flashLoanFeeBps: 0,
+            mint: (0, umi_1.publicKey)(supply.mint),
+            padding1: [],
+            padding2: [],
+            padding: new Uint8Array([]),
+        },
+        debt: {
+            amountUsed: {
+                baseUnit: debt.amountUsedBaseUnit,
+                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(debtUsd, constants_1.USD_DECIMALS),
+            },
+            amountCanBeUsed: {
+                baseUnit: (0, numberUtils_1.toBaseUnit)(1000000, debt.decimals),
+                baseAmountUsdValue: BigInt(Math.round(1000000 * debt.price)),
+            },
+            baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(debt.price, constants_1.USD_DECIMALS),
+            borrowFeeBps: 0,
+            decimals: debt.decimals,
+            flashLoanFeeBps: 0,
+            mint: (0, umi_1.publicKey)(debt.mint),
+            padding1: [],
+            padding2: [],
+            padding: new Uint8Array([]),
+        },
+        netWorth: {
+            baseUnit: (0, numberUtils_1.toBaseUnit)((supplyUsd - debtUsd) / supply.price, supply.decimals),
+            baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd - debtUsd, constants_1.USD_DECIMALS),
+        },
+        maxLtvBps,
+        liqThresholdBps,
+        lastUpdated: BigInt((0, generalUtils_1.currentUnixSeconds)()),
+        padding1: [],
+        padding2: [],
+        padding: [],
+    };
+}
 class LivePositionUpdates {
     constructor() {
         this.supplyAdjustment = BigInt(0);

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

@@ -1,13 +1,15 @@
 import { PublicKey } from "@solana/web3.js";
 import { SolautoClient } from "../../clients/solautoClient";
+import { DCASettings, FeeType, PositionState, SolautoSettingsParameters } from "../../generated";
 import { QuoteResponse } from "@jup-ag/api";
 import { JupSwapDetails } from "../jupiterUtils";
 export interface RebalanceValues {
     increasingLeverage: boolean;
     debtAdjustmentUsd: number;
+    amountToDcaIn: number;
     amountUsdToDcaIn: number;
 }
-export declare function getRebalanceValues(client: SolautoClient, targetLiqUtilizationRateBps?: number, limitGapBps?: number): RebalanceValues;
+export declare function getRebalanceValues(state: PositionState, settings: SolautoSettingsParameters | undefined, dca: DCASettings | undefined, feeType: FeeType, currentUnixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number, limitGapBps?: number): RebalanceValues;
 export interface FlashLoanDetails {
     baseUnitAmount: bigint;
     mint: PublicKey;

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;AAS5D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA4IjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CA8EjB;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;AAQzB,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,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"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -3,81 +3,72 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRebalanceValues = getRebalanceValues;
 exports.getFlashLoanDetails = getFlashLoanDetails;
 exports.getJupSwapRebalanceDetails = getJupSwapRebalanceDetails;
-const generated_1 = require("../../generated");
 const generalUtils_1 = require("./generalUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const generalUtils_2 = require("../generalUtils");
 const numberUtils_1 = require("../numberUtils");
 const generalAccounts_1 = require("../../constants/generalAccounts");
 const solautoConstants_1 = require("../../constants/solautoConstants");
-function getAdditionalAmountToDcaIn(client) {
-    const dca = client.solautoPositionActiveDca();
+function getAdditionalAmountToDcaIn(dca) {
     if (dca.debtToAddBaseUnit === BigInt(0)) {
         return 0;
     }
-    const debtBalance = Number(client.solautoPositionData?.position.dca.debtToAddBaseUnit ?? 0) +
-        Number(client.livePositionUpdates.debtTaBalanceAdjustment ?? 0);
+    const debtBalance = Number(dca.debtToAddBaseUnit);
     const updatedDebtBalance = (0, generalUtils_1.getUpdatedValueFromAutomation)(debtBalance, 0, dca.automation, (0, generalUtils_2.currentUnixSeconds)());
     return debtBalance - updatedDebtBalance;
 }
-function getStandardTargetLiqUtilizationRateBps(client) {
-    if (!client.selfManaged) {
-        const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(client.solautoPositionSettings(), (0, generalUtils_2.currentUnixSeconds)());
-        const repayFrom = adjustedSettings.repayToBps - adjustedSettings.repayGap;
-        const boostFrom = adjustedSettings.boostToBps + adjustedSettings.boostGap;
-        if (client.solautoPositionState.liqUtilizationRateBps < boostFrom) {
-            return adjustedSettings.boostToBps;
-        }
-        else if (client.solautoPositionState.liqUtilizationRateBps > repayFrom ||
-            repayFrom - client.solautoPositionState.liqUtilizationRateBps <
-                repayFrom * 0.015) {
-            return adjustedSettings.repayToBps;
-        }
-        else {
-            throw new Error("Invalid rebalance condition");
-        }
+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;
+    if (state.liqUtilizationRateBps < boostFrom) {
+        return adjustedSettings.boostToBps;
+    }
+    else if (state.liqUtilizationRateBps > repayFrom ||
+        repayFrom - state.liqUtilizationRateBps < repayFrom * 0.015) {
+        return adjustedSettings.repayToBps;
     }
     else {
-        throw new Error("This is a self-managed position, a targetLiqUtilizationRateBps must be provided initiate a rebalance");
+        throw new Error("Invalid rebalance condition");
     }
 }
-function targetLiqUtilizationRateBpsFromDCA(client) {
-    const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(client.solautoPositionSettings(), (0, generalUtils_2.currentUnixSeconds)());
+function targetLiqUtilizationRateBpsFromDCA(state, settings, dca) {
+    const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(settings, (0, generalUtils_2.currentUnixSeconds)());
     let targetRateBps = 0;
-    if (client.solautoPositionActiveDca().debtToAddBaseUnit > BigInt(0)) {
-        targetRateBps = Math.max(client.solautoPositionState.liqUtilizationRateBps, adjustedSettings.boostToBps);
+    if (dca.debtToAddBaseUnit > BigInt(0)) {
+        targetRateBps = Math.max(state.liqUtilizationRateBps, adjustedSettings.boostToBps);
     }
     else {
         targetRateBps = adjustedSettings.boostToBps;
     }
     return targetRateBps;
 }
-function isDcaRebalance(client) {
-    if (client.solautoPositionActiveDca() === undefined || client.selfManaged) {
+function isDcaRebalance(state, settings, dca, currentUnixTime) {
+    if (dca === undefined || dca.automation.targetPeriods === 0) {
         return false;
     }
-    const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(client.solautoPositionSettings(), (0, generalUtils_2.currentUnixSeconds)());
-    if (client.solautoPositionState.liqUtilizationRateBps >
+    const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(settings, (0, generalUtils_2.currentUnixSeconds)());
+    if (state.liqUtilizationRateBps >
         adjustedSettings.repayToBps + adjustedSettings.repayGap) {
         return false;
     }
-    if (client.solautoPositionActiveDca().automation.targetPeriods === 0) {
-        return false;
-    }
-    if (!(0, generalUtils_1.eligibleForNextAutomationPeriod)(client.solautoPositionActiveDca().automation)) {
+    if (!(0, generalUtils_1.eligibleForNextAutomationPeriod)(dca.automation, currentUnixTime)) {
         return false;
     }
     return true;
 }
-function getTargetRateAndDcaAmount(client, targetLiqUtilizationRateBps) {
+function getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, targetLiqUtilizationRateBps) {
     if (targetLiqUtilizationRateBps !== undefined) {
         return {
             targetRateBps: targetLiqUtilizationRateBps,
         };
     }
-    if (isDcaRebalance(client)) {
-        const amountToDcaIn = getAdditionalAmountToDcaIn(client);
-        const targetLiqUtilizationRateBps = targetLiqUtilizationRateBpsFromDCA(client);
+    if (settings === undefined) {
+        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);
+        const targetLiqUtilizationRateBps = targetLiqUtilizationRateBpsFromDCA(state, settings, dca);
         return {
             targetRateBps: targetLiqUtilizationRateBps,
             amountToDcaIn,
@@ -85,33 +76,30 @@ function getTargetRateAndDcaAmount(client, targetLiqUtilizationRateBps) {
     }
     else {
         return {
-            targetRateBps: getStandardTargetLiqUtilizationRateBps(client),
+            targetRateBps: getStandardTargetLiqUtilizationRateBps(state, settings),
         };
     }
 }
-function getRebalanceValues(client, targetLiqUtilizationRateBps, limitGapBps) {
-    if (client.solautoPositionState === undefined ||
-        client.solautoPositionState.lastUpdated <
+function getRebalanceValues(state, settings, dca, feeType, currentUnixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps, limitGapBps) {
+    if (state === undefined ||
+        state.lastUpdated <
             BigInt(Math.round((0, generalUtils_2.currentUnixSeconds)() - solautoConstants_1.MIN_POSITION_STATE_FRESHNESS_SECS))) {
         throw new Error("Requires a fresh position state to get rebalance details");
     }
-    const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(client, targetLiqUtilizationRateBps);
-    const amountUsdToDcaIn = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountToDcaIn ?? 0)), client.solautoPositionState.debt.decimals) * solautoConstants_1.PRICES[client.debtMint.toString()].price;
-    const increasingLeverage = amountUsdToDcaIn > 0 ||
-        client.solautoPositionState.liqUtilizationRateBps < targetRateBps;
+    const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, targetLiqUtilizationRateBps);
+    const amountUsdToDcaIn = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountToDcaIn ?? 0)), state.debt.decimals) *
+        debtPrice;
+    const increasingLeverage = amountUsdToDcaIn > 0 || state.liqUtilizationRateBps < targetRateBps;
     let adjustmentFeeBps = 0;
     if (increasingLeverage) {
-        adjustmentFeeBps = (0, generalUtils_1.getSolautoFeesBps)(client.referredByState !== undefined, client.solautoPositionData?.feeType ?? generated_1.FeeType.Small).total;
-    }
-    const supplyUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) + amountUsdToDcaIn;
-    const debtUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.debt.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
-    let debtAdjustmentUsd = (0, numberUtils_1.getDebtAdjustmentUsd)(client.solautoPositionState.liqThresholdBps, supplyUsd, debtUsd, targetRateBps, adjustmentFeeBps);
-    const input = increasingLeverage
-        ? client.solautoPositionState.debt
-        : client.solautoPositionState.supply;
-    const inputMarketPrice = increasingLeverage
-        ? solautoConstants_1.PRICES[client.debtMint.toString()].price
-        : solautoConstants_1.PRICES[client.supplyMint.toString()].price;
+        adjustmentFeeBps = (0, generalUtils_1.getSolautoFeesBps)(false, feeType).total;
+    }
+    const supplyUsd = (0, numberUtils_1.fromBaseUnit)(state.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) +
+        amountUsdToDcaIn;
+    const debtUsd = (0, numberUtils_1.fromBaseUnit)(state.debt.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
+    let debtAdjustmentUsd = (0, numberUtils_1.getDebtAdjustmentUsd)(state.liqThresholdBps, supplyUsd, debtUsd, targetRateBps, adjustmentFeeBps);
+    const input = increasingLeverage ? state.debt : state.supply;
+    const inputMarketPrice = increasingLeverage ? debtPrice : supplyPrice;
     const limitGap = limitGapBps
         ? (0, numberUtils_1.fromBps)(limitGapBps)
         : (0, numberUtils_1.fromBps)(solautoConstants_1.DEFAULT_LIMIT_GAP_BPS);
@@ -126,6 +114,7 @@ function getRebalanceValues(client, targetLiqUtilizationRateBps, limitGapBps) {
     return {
         increasingLeverage,
         debtAdjustmentUsd,
+        amountToDcaIn: amountToDcaIn ?? 0,
         amountUsdToDcaIn,
     };
 }
@@ -186,7 +175,7 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
         inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
         destinationWallet: client.solautoPosition,
-        slippageBpsIncFactor: 0.25 + ((attemptNum ?? 0) * 0.2),
+        slippageBpsIncFactor: 0.25 + (attemptNum ?? 0) * 0.2,
         amount: rebalancingToZero
             ? client.solautoPositionState.debt.amountUsed.baseUnit +
                 BigInt(Math.round(Number(client.solautoPositionState.debt.amountUsed.baseUnit) *

package/package.json

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

@@ -14,6 +14,7 @@ import {
   Account as SplTokenAccount,
 } from "@solana/spl-token";
 import {
+  FeeType,
   LendingPlatform,
   ReferralState,
   SOLAUTO_PROGRAM_ID,
@@ -56,6 +57,7 @@ import {
   getLendingAccountWithdrawInstructionDataSerializer,
   MARGINFI_PROGRAM_ID,
 } from "../marginfi-sdk";
+import { PRICES } from "../constants";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -548,7 +550,6 @@ export async function getTransactionChores(
   return [choresBefore, choresAfter];
 }
 
-
 export async function buildSolautoRebalanceTransaction(
   client: SolautoClient,
   targetLiqUtilizationRateBps?: number,
@@ -570,14 +571,23 @@ export async function buildSolautoRebalanceTransaction(
           client.solautoPositionData?.position.settingParams!,
         client.livePositionUpdates.activeDca ??
           client.solautoPositionData?.position.dca!,
-          currentUnixSeconds()
+        currentUnixSeconds()
       ))
   ) {
     client.log("Not eligible for a rebalance");
     return undefined;
   }
 
-  const values = getRebalanceValues(client, targetLiqUtilizationRateBps);
+  const values = getRebalanceValues(
+    client.solautoPositionState!,
+    client.solautoPositionSettings(),
+    client.solautoPositionActiveDca(),
+    client.solautoPositionData?.feeType ?? FeeType.Small,
+    currentUnixSeconds(),
+    PRICES[client.supplyMint.toString()].price,
+    PRICES[client.debtMint.toString()].price,
+    targetLiqUtilizationRateBps
+  );
   client.log("Rebalance values: ", values);
 
   const swapDetails = getJupSwapRebalanceDetails(

package/src/utils/solauto/generalUtils.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { isOption, isSome, Umi } from "@metaplex-foundation/umi";
+import { isOption, isSome, publicKey, Umi } from "@metaplex-foundation/umi";
 import {
   AutomationSettings,
   DCASettings,
@@ -54,9 +54,9 @@ export function nextAutomationPeriodTimestamp(
 
 export function eligibleForNextAutomationPeriod(
   automation: AutomationSettings,
-  currentUnixSecs?: number
+  currentUnixTime: number
 ): boolean {
-  return (currentUnixSecs ?? currentUnixSeconds()) >= nextAutomationPeriodTimestamp(automation);
+  return currentUnixTime >= nextAutomationPeriodTimestamp(automation);
 }
 
 export function getUpdatedValueFromAutomation(
@@ -79,16 +79,16 @@ export function getUpdatedValueFromAutomation(
 
 export function getAdjustedSettingsFromAutomation(
   settings: SolautoSettingsParameters,
-  currentUnixSecs?: number
+  currentUnixTime: number
 ): SolautoSettingsParameters {
   const boostToBps =
     settings.automation.targetPeriods > 0 &&
-    eligibleForNextAutomationPeriod(settings.automation, currentUnixSecs)
+    eligibleForNextAutomationPeriod(settings.automation, currentUnixTime)
       ? getUpdatedValueFromAutomation(
           settings.boostToBps,
           settings.targetBoostToBps,
           settings.automation,
-          currentUnixSecs ?? currentUnixSeconds()
+          currentUnixTime
         )
       : settings.boostToBps;
 
@@ -122,10 +122,11 @@ export function getSolautoFeesBps(
 export function eligibleForRebalance(
   positionState: PositionState,
   positionSettings: SolautoSettingsParameters,
-  positionDca: DCASettings,
+  positionDca: DCASettings | undefined,
   currentUnixSecs: number
 ): RebalanceAction | undefined {
   if (
+    positionDca &&
     positionDca.automation.targetPeriods > 0 &&
     eligibleForNextAutomationPeriod(positionDca.automation, currentUnixSecs)
   ) {
@@ -161,10 +162,13 @@ export function eligibleForRebalance(
 export function eligibleForRefresh(
   positionState: PositionState,
   positionSettings: SolautoSettingsParameters,
-  currentUnixSecs?: number
+  currentUnixTime: number
 ): boolean {
   if (positionSettings.automation.targetPeriods > 0) {
-    return eligibleForNextAutomationPeriod(positionSettings.automation, currentUnixSecs);
+    return eligibleForNextAutomationPeriod(
+      positionSettings.automation,
+      currentUnixTime
+    );
   } else {
     return (
       currentUnixSeconds() - Number(positionState.lastUpdated) >
@@ -322,15 +326,30 @@ export async function getAllPositionsByAuthority(
   return allPositions;
 }
 
-export async function positionStateWithPrices(
-  umi: Umi,
-  state: PositionState,
-  protocolAccount: PublicKey,
-  lendingPlatform: LendingPlatform,
-  supplyPrice?: number,
-  debtPrice?: number
-): Promise<PositionState | undefined> {
+export async function positionStateWithPrices({
+  state,
+  supplyPrice,
+  debtPrice,
+  umi,
+  protocolAccount,
+  lendingPlatform,
+}: {
+  state: PositionState;
+  umi?: Umi;
+  protocolAccount?: PublicKey;
+  lendingPlatform?: LendingPlatform;
+  supplyPrice?: number;
+  debtPrice?: number;
+}): Promise<PositionState | undefined> {
   if (currentUnixSeconds() - Number(state.lastUpdated) > 60 * 60 * 24 * 7) {
+    if (
+      umi === undefined ||
+      protocolAccount === undefined ||
+      lendingPlatform === undefined
+    ) {
+      throw new Error("Missing required parameters");
+    }
+
     if (lendingPlatform === LendingPlatform.Marginfi) {
       return await getMarginfiAccountPositionState(
         umi,
@@ -364,7 +383,10 @@ export async function positionStateWithPrices(
       state.liqThresholdBps
     ),
     netWorth: {
-      ...state.netWorth,
+      baseUnit: toBaseUnit(
+        (supplyUsd - debtUsd) / supplyPrice,
+        state.supply.decimals
+      ),
       baseAmountUsdValue: toBaseUnit(supplyUsd - debtUsd, USD_DECIMALS),
     },
     supply: {
@@ -384,6 +406,82 @@ export async function positionStateWithPrices(
   };
 }
 
+interface AssetProps {
+  amountUsedBaseUnit: bigint;
+  decimals: number;
+  price: number;
+  mint: PublicKey;
+}
+
+export function createFakePositionState(
+  supply: AssetProps,
+  debt: AssetProps,
+  maxLtvBps: number,
+  liqThresholdBps: number
+): PositionState {
+  const supplyUsd =
+    fromBaseUnit(supply.amountUsedBaseUnit, supply.decimals) * supply.price;
+  const debtUsd =
+    fromBaseUnit(debt.amountUsedBaseUnit, debt.decimals) * debt.price;
+
+  return {
+    liqUtilizationRateBps: getLiqUtilzationRateBps(
+      supplyUsd,
+      debtUsd,
+      liqThresholdBps
+    ),
+    supply: {
+      amountUsed: {
+        baseUnit: supply.amountUsedBaseUnit,
+        baseAmountUsdValue: toBaseUnit(supplyUsd, USD_DECIMALS),
+      },
+      amountCanBeUsed: {
+        baseUnit: toBaseUnit(1000000, supply.decimals),
+        baseAmountUsdValue: BigInt(Math.round(1000000 * supply.price)),
+      },
+      baseAmountMarketPriceUsd: toBaseUnit(supply.price, USD_DECIMALS),
+      borrowFeeBps: 0,
+      decimals: supply.decimals,
+      flashLoanFeeBps: 0,
+      mint: publicKey(supply.mint),
+      padding1: [],
+      padding2: [],
+      padding: new Uint8Array([]),
+    },
+    debt: {
+      amountUsed: {
+        baseUnit: debt.amountUsedBaseUnit,
+        baseAmountUsdValue: toBaseUnit(debtUsd, USD_DECIMALS),
+      },
+      amountCanBeUsed: {
+        baseUnit: toBaseUnit(1000000, debt.decimals),
+        baseAmountUsdValue: BigInt(Math.round(1000000 * debt.price)),
+      },
+      baseAmountMarketPriceUsd: toBaseUnit(debt.price, USD_DECIMALS),
+      borrowFeeBps: 0,
+      decimals: debt.decimals,
+      flashLoanFeeBps: 0,
+      mint: publicKey(debt.mint),
+      padding1: [],
+      padding2: [],
+      padding: new Uint8Array([]),
+    },
+    netWorth: {
+      baseUnit: toBaseUnit(
+        (supplyUsd - debtUsd) / supply.price,
+        supply.decimals
+      ),
+      baseAmountUsdValue: toBaseUnit(supplyUsd - debtUsd, USD_DECIMALS),
+    },
+    maxLtvBps,
+    liqThresholdBps,
+    lastUpdated: BigInt(currentUnixSeconds()),
+    padding1: [],
+    padding2: [],
+    padding: [],
+  };
+}
+
 type PositionAdjustment =
   | { type: "supply"; value: bigint }
   | { type: "debt"; value: bigint }

package/src/utils/solauto/rebalanceUtils.ts

@@ -1,6 +1,12 @@
 import { PublicKey } from "@solana/web3.js";
 import { SolautoClient } from "../../clients/solautoClient";
-import { FeeType, PositionTokenUsage } from "../../generated";
+import {
+  DCASettings,
+  FeeType,
+  PositionState,
+  PositionTokenUsage,
+  SolautoSettingsParameters,
+} from "../../generated";
 import {
   eligibleForNextAutomationPeriod,
   getAdjustedSettingsFromAutomation,
@@ -26,15 +32,12 @@ import {
   PRICES,
 } from "../../constants/solautoConstants";
 
-function getAdditionalAmountToDcaIn(client: SolautoClient): number {
-  const dca = client.solautoPositionActiveDca()!;
+function getAdditionalAmountToDcaIn(dca: DCASettings): number {
   if (dca.debtToAddBaseUnit === BigInt(0)) {
     return 0;
   }
 
-  const debtBalance =
-    Number(client.solautoPositionData?.position.dca.debtToAddBaseUnit ?? 0) +
-    Number(client.livePositionUpdates.debtTaBalanceAdjustment ?? 0);
+  const debtBalance = Number(dca.debtToAddBaseUnit);
   const updatedDebtBalance = getUpdatedValueFromAutomation(
     debtBalance,
     0,
@@ -45,44 +48,44 @@ function getAdditionalAmountToDcaIn(client: SolautoClient): number {
   return debtBalance - updatedDebtBalance;
 }
 
-function getStandardTargetLiqUtilizationRateBps(client: SolautoClient): number {
-  if (!client.selfManaged) {
-    const adjustedSettings = getAdjustedSettingsFromAutomation(
-      client.solautoPositionSettings()!,
-      currentUnixSeconds()
-    );
+function getStandardTargetLiqUtilizationRateBps(
+  state: PositionState,
+  settings: SolautoSettingsParameters
+): number {
+  const adjustedSettings = getAdjustedSettingsFromAutomation(
+    settings,
+    currentUnixSeconds()
+  );
+
+  const repayFrom = adjustedSettings.repayToBps - adjustedSettings.repayGap;
+  const boostFrom = adjustedSettings.boostToBps + adjustedSettings.boostGap;
 
-    const repayFrom = adjustedSettings.repayToBps - adjustedSettings.repayGap;
-    const boostFrom = adjustedSettings.boostToBps + adjustedSettings.boostGap;
-
-    if (client.solautoPositionState!.liqUtilizationRateBps < boostFrom) {
-      return adjustedSettings.boostToBps;
-    } else if (
-      client.solautoPositionState!.liqUtilizationRateBps > repayFrom ||
-      repayFrom - client.solautoPositionState!.liqUtilizationRateBps <
-        repayFrom * 0.015
-    ) {
-      return adjustedSettings.repayToBps;
-    } else {
-      throw new Error("Invalid rebalance condition");
-    }
+  if (state.liqUtilizationRateBps < boostFrom) {
+    return adjustedSettings.boostToBps;
+  } else if (
+    state.liqUtilizationRateBps > repayFrom ||
+    repayFrom - state.liqUtilizationRateBps < repayFrom * 0.015
+  ) {
+    return adjustedSettings.repayToBps;
   } else {
-    throw new Error(
-      "This is a self-managed position, a targetLiqUtilizationRateBps must be provided initiate a rebalance"
-    );
+    throw new Error("Invalid rebalance condition");
   }
 }
 
-function targetLiqUtilizationRateBpsFromDCA(client: SolautoClient) {
+function targetLiqUtilizationRateBpsFromDCA(
+  state: PositionState,
+  settings: SolautoSettingsParameters,
+  dca: DCASettings
+) {
   const adjustedSettings = getAdjustedSettingsFromAutomation(
-    client.solautoPositionSettings()!,
+    settings,
     currentUnixSeconds()
   );
 
   let targetRateBps = 0;
-  if (client.solautoPositionActiveDca()!.debtToAddBaseUnit > BigInt(0)) {
+  if (dca.debtToAddBaseUnit > BigInt(0)) {
     targetRateBps = Math.max(
-      client.solautoPositionState!.liqUtilizationRateBps,
+      state.liqUtilizationRateBps,
       adjustedSettings.boostToBps
     );
   } else {
@@ -91,32 +94,29 @@ function targetLiqUtilizationRateBpsFromDCA(client: SolautoClient) {
   return targetRateBps;
 }
 
-function isDcaRebalance(client: SolautoClient): boolean {
-  if (client.solautoPositionActiveDca() === undefined || client.selfManaged) {
+function isDcaRebalance(
+  state: PositionState,
+  settings: SolautoSettingsParameters,
+  dca: DCASettings | undefined,
+  currentUnixTime: number
+): boolean {
+  if (dca === undefined || dca.automation.targetPeriods === 0) {
     return false;
   }
 
   const adjustedSettings = getAdjustedSettingsFromAutomation(
-    client.solautoPositionSettings()!,
+    settings,
     currentUnixSeconds()
   );
 
   if (
-    client.solautoPositionState!.liqUtilizationRateBps >
+    state.liqUtilizationRateBps >
     adjustedSettings.repayToBps + adjustedSettings.repayGap
   ) {
     return false;
   }
 
-  if (client.solautoPositionActiveDca()!.automation.targetPeriods === 0) {
-    return false;
-  }
-
-  if (
-    !eligibleForNextAutomationPeriod(
-      client.solautoPositionActiveDca()!.automation
-    )
-  ) {
+  if (!eligibleForNextAutomationPeriod(dca.automation, currentUnixTime)) {
     return false;
   }
 
@@ -124,7 +124,10 @@ function isDcaRebalance(client: SolautoClient): boolean {
 }
 
 function getTargetRateAndDcaAmount(
-  client: SolautoClient,
+  state: PositionState,
+  settings: SolautoSettingsParameters | undefined,
+  dca: DCASettings | undefined,
+  currentUnixTime: number,
   targetLiqUtilizationRateBps?: number
 ): { targetRateBps: number; amountToDcaIn?: number } {
   if (targetLiqUtilizationRateBps !== undefined) {
@@ -133,10 +136,19 @@ function getTargetRateAndDcaAmount(
     };
   }
 
-  if (isDcaRebalance(client)) {
-    const amountToDcaIn = getAdditionalAmountToDcaIn(client);
-    const targetLiqUtilizationRateBps =
-      targetLiqUtilizationRateBpsFromDCA(client);
+  if (settings === undefined) {
+    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!);
+    const targetLiqUtilizationRateBps = targetLiqUtilizationRateBpsFromDCA(
+      state,
+      settings,
+      dca!
+    );
 
     return {
       targetRateBps: targetLiqUtilizationRateBps,
@@ -144,7 +156,7 @@ function getTargetRateAndDcaAmount(
     };
   } else {
     return {
-      targetRateBps: getStandardTargetLiqUtilizationRateBps(client),
+      targetRateBps: getStandardTargetLiqUtilizationRateBps(state, settings),
     };
   }
 }
@@ -152,17 +164,24 @@ function getTargetRateAndDcaAmount(
 export interface RebalanceValues {
   increasingLeverage: boolean;
   debtAdjustmentUsd: number;
+  amountToDcaIn: number;
   amountUsdToDcaIn: number;
 }
 
 export function getRebalanceValues(
-  client: SolautoClient,
+  state: PositionState,
+  settings: SolautoSettingsParameters | undefined,
+  dca: DCASettings | undefined,
+  feeType: FeeType,
+  currentUnixTime: number,
+  supplyPrice: number,
+  debtPrice: number,
   targetLiqUtilizationRateBps?: number,
   limitGapBps?: number
 ): RebalanceValues {
   if (
-    client.solautoPositionState === undefined ||
-    client.solautoPositionState.lastUpdated <
+    state === undefined ||
+    state.lastUpdated <
       BigInt(
         Math.round(currentUnixSeconds() - MIN_POSITION_STATE_FRESHNESS_SECS)
       )
@@ -171,50 +190,41 @@ export function getRebalanceValues(
   }
 
   const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(
-    client,
+    state,
+    settings,
+    dca,
+    currentUnixTime,
     targetLiqUtilizationRateBps
   );
 
   const amountUsdToDcaIn =
-    fromBaseUnit(
-      BigInt(Math.round(amountToDcaIn ?? 0)),
-      client.solautoPositionState!.debt.decimals
-    ) * PRICES[client.debtMint.toString()].price;
+    fromBaseUnit(BigInt(Math.round(amountToDcaIn ?? 0)), state.debt.decimals) *
+    debtPrice;
 
   const increasingLeverage =
-    amountUsdToDcaIn > 0 ||
-    client.solautoPositionState!.liqUtilizationRateBps < targetRateBps;
+    amountUsdToDcaIn > 0 || state.liqUtilizationRateBps < targetRateBps;
   let adjustmentFeeBps = 0;
   if (increasingLeverage) {
-    adjustmentFeeBps = getSolautoFeesBps(
-      client.referredByState !== undefined,
-      client.solautoPositionData?.feeType ?? FeeType.Small
-    ).total;
+    adjustmentFeeBps = getSolautoFeesBps(false, feeType).total;
   }
 
   const supplyUsd =
-    fromBaseUnit(
-      client.solautoPositionState!.supply.amountUsed.baseAmountUsdValue,
-      USD_DECIMALS
-    ) + amountUsdToDcaIn;
+    fromBaseUnit(state.supply.amountUsed.baseAmountUsdValue, USD_DECIMALS) +
+    amountUsdToDcaIn;
   const debtUsd = fromBaseUnit(
-    client.solautoPositionState!.debt.amountUsed.baseAmountUsdValue,
+    state.debt.amountUsed.baseAmountUsdValue,
     USD_DECIMALS
   );
   let debtAdjustmentUsd = getDebtAdjustmentUsd(
-    client.solautoPositionState!.liqThresholdBps,
+    state.liqThresholdBps,
     supplyUsd,
     debtUsd,
     targetRateBps,
     adjustmentFeeBps
   );
 
-  const input = increasingLeverage
-    ? client.solautoPositionState!.debt
-    : client.solautoPositionState!.supply;
-  const inputMarketPrice = increasingLeverage
-    ? PRICES[client.debtMint.toString()].price
-    : PRICES[client.supplyMint.toString()].price;
+  const input = increasingLeverage ? state.debt : state.supply;
+  const inputMarketPrice = increasingLeverage ? debtPrice : supplyPrice;
 
   const limitGap = limitGapBps
     ? fromBps(limitGapBps)
@@ -235,6 +245,7 @@ export function getRebalanceValues(
   return {
     increasingLeverage,
     debtAdjustmentUsd,
+    amountToDcaIn: amountToDcaIn ?? 0,
     amountUsdToDcaIn,
   };
 }
@@ -269,7 +280,7 @@ export function getFlashLoanDetails(
     values.debtAdjustmentUsd > 0
       ? debtUsd + debtAdjustmentWithSlippage
       : debtUsd;
-  
+
   const tempLiqUtilizationRateBps = getLiqUtilzationRateBps(
     supplyUsd,
     debtUsd,
@@ -342,7 +353,7 @@ export function getJupSwapRebalanceDetails(
     inputMint: toWeb3JsPublicKey(input.mint),
     outputMint: toWeb3JsPublicKey(output.mint),
     destinationWallet: client.solautoPosition,
-    slippageBpsIncFactor: 0.25 + ((attemptNum ?? 0) * 0.2),
+    slippageBpsIncFactor: 0.25 + (attemptNum ?? 0) * 0.2,
     amount: rebalancingToZero
       ? client.solautoPositionState!.debt.amountUsed.baseUnit +
         BigInt(

package/tests/shared.ts

@@ -1,14 +1,17 @@
 import { Signer, createSignerFromKeypair } from "@metaplex-foundation/umi";
-import { Connection, clusterApiUrl } from "@solana/web3.js";
+import { Connection, Keypair, clusterApiUrl } from "@solana/web3.js";
 import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import { getSecretKey } from "../local/shared";
+import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 
-export function setupTest(keypairFilename?: string): Signer {
+export function setupTest(keypairFilename?: string, random?: boolean): Signer {
   const umi = createUmi(
     new Connection(clusterApiUrl("mainnet-beta"), "confirmed")
   );
   const secretKey = getSecretKey(keypairFilename);
-  const signerKeypair = umi.eddsa.createKeypairFromSecretKey(secretKey);
+  const signerKeypair = random
+    ? fromWeb3JsKeypair(Keypair.generate())
+    : umi.eddsa.createKeypairFromSecretKey(secretKey);
   const signer = createSignerFromKeypair(umi, signerKeypair);
 
   return signer;

package/tests/transactions/solautoMarginfi.ts

@@ -19,7 +19,6 @@ import {
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
 import { USDC_MINT } from "../../src/constants";
-import { positionStateWithLatestPrices } from "../../src/utils/solauto/generalUtils";
 
 describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest();

package/tests/unit/rebalanceCalculations.ts

@@ -4,7 +4,6 @@ import { NATIVE_MINT } from "@solana/spl-token";
 import { assert } from "chai";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import { setupTest } from "../shared";
-import { MARGINFI_ACCOUNTS } from "../../src/constants/marginfiAccounts";
 import { getRebalanceValues } from "../../src/utils/solauto/rebalanceUtils";
 import { publicKey } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../../src/clients/solautoClient";
@@ -23,18 +22,21 @@ import {
 } from "../../src/utils/numberUtils";
 import { USD_DECIMALS } from "../../src/constants/generalAccounts";
 import {
+  createFakePositionState,
   eligibleForNextAutomationPeriod,
   getAdjustedSettingsFromAutomation,
   getSolautoFeesBps,
   getUpdatedValueFromAutomation,
+  positionStateWithPrices,
 } from "../../src/utils/solauto/generalUtils";
 import {
   currentUnixSeconds,
   getTokenPrices,
 } from "../../src/utils/generalUtils";
 import { USDC_MINT } from "../../src/constants/tokenConstants";
+import { PRICES } from "../../src/constants";
 
-const signer = setupTest();
+const signer = setupTest(undefined, true);
 
 function assertAccurateRebalance(
   client: SolautoClient,
@@ -43,7 +45,16 @@ function assertAccurateRebalance(
   expectedUsdToDcaIn?: number
 ) {
   const { increasingLeverage, debtAdjustmentUsd, amountUsdToDcaIn } =
-    getRebalanceValues(client, targetLiqUtilizationRateBps);
+    getRebalanceValues(
+      client.solautoPositionState!,
+      client.solautoPositionSettings(),
+      client.solautoPositionActiveDca(),
+      client.solautoPositionData?.feeType ?? FeeType.Small,
+      currentUnixSeconds(),
+      PRICES[client.supplyMint.toString()].price,
+      PRICES[client.debtMint.toString()].price,
+      targetLiqUtilizationRateBps
+    );
 
   let adjustmentFeeBps = 0;
   if (increasingLeverage) {
@@ -55,7 +66,9 @@ function assertAccurateRebalance(
 
   assert(
     Math.round(amountUsdToDcaIn) === Math.round(expectedUsdToDcaIn ?? 0),
-    `Expected DCA-in amount does not match ${Math.round(amountUsdToDcaIn)}, ${Math.round(expectedUsdToDcaIn ?? 0)}`
+    `Expected DCA-in amount does not match ${Math.round(
+      amountUsdToDcaIn
+    )}, ${Math.round(expectedUsdToDcaIn ?? 0)}`
   );
 
   const newSupply =
@@ -77,8 +90,9 @@ function assertAccurateRebalance(
     client.solautoPositionState!.liqThresholdBps
   );
   assert(
-    Math.round(newLiqUtilizationRateBps) === expectedLiqUtilizationRateBps,
-    `Expected liq utilization rate does not match ${Math.round(newLiqUtilizationRateBps)}, ${expectedLiqUtilizationRateBps}`
+    Math.round(newLiqUtilizationRateBps) ===
+      Math.round(expectedLiqUtilizationRateBps),
+    `Expected liq utilization rate does not match ${newLiqUtilizationRateBps}, ${expectedLiqUtilizationRateBps}`
   );
 }
 
@@ -97,10 +111,37 @@ async function getFakePosition(
     positionId: 1,
     signer,
     supplyMint: new PublicKey(NATIVE_MINT),
-    debtMint: new PublicKey(MARGINFI_ACCOUNTS.USDC.mint),
+    debtMint: new PublicKey(USDC_MINT),
+  });
+
+  const supplyUsd = 1000;
+  const maxLtvBps = 6400;
+  const liqThresholdBps = 8181;
+  client.solautoPositionState = await positionStateWithPrices({
+    state: createFakePositionState(
+      {
+        amountUsedBaseUnit: toBaseUnit(supplyUsd / supplyPrice, 9),
+        decimals: 9,
+        price: PRICES[NATIVE_MINT.toString()].price,
+        mint: NATIVE_MINT,
+      },
+      {
+        amountUsedBaseUnit: toBaseUnit(
+          (supplyUsd *
+            fromBps(liqThresholdBps) *
+            fromBps(fakeLiqUtilizationRateBps)) /
+            debtPrice,
+          6
+        ),
+        decimals: 6,
+        price: 1,
+        mint: new PublicKey(USDC_MINT),
+      },
+      maxLtvBps,
+      liqThresholdBps
+    ),
   });
 
-  const state = await client.getFreshPositionState();
   client.solautoPositionData = {
     positionId: [1],
     bump: [0],
@@ -129,7 +170,7 @@ async function getFakePosition(
       padding1: [],
       padding: [],
     },
-    state: state!,
+    state: client.solautoPositionState!,
     rebalance: {
       rebalanceType: SolautoRebalanceType.Regular,
       targetLiqUtilizationRateBps: 0,
@@ -139,7 +180,7 @@ async function getFakePosition(
       padding2: [],
       padding: new Uint8Array([]),
     },
-    feeType: FeeType.Small,
+    feeType: FeeType.Default,
     padding1: [],
     padding2: [],
     padding: [],
@@ -155,25 +196,14 @@ async function getFakePosition(
     },
   };
 
-  const supplyUsd = 1000;
-  client.livePositionUpdates.new({
-    type: "supply",
-    value: toBaseUnit(supplyUsd / supplyPrice, state!.supply.decimals),
-  });
-  client.livePositionUpdates.new({
-    type: "debt",
-    value: toBaseUnit(
-      (supplyUsd *
-        fromBps(state!.liqThresholdBps) *
-        fromBps(fakeLiqUtilizationRateBps)) /
-        debtPrice,
-      state!.debt.decimals
-    ),
-  });
-
-  client.solautoPositionState = await client.getFreshPositionState();
   client.solautoPositionState!.lastUpdated = BigInt(currentUnixSeconds());
 
+  assert(
+    fakeLiqUtilizationRateBps ===
+      client.solautoPositionState!.liqUtilizationRateBps,
+    "Fake position not set up correctly"
+  );
+
   return client;
 }
 
@@ -227,7 +257,8 @@ async function dcaRebalanceFromFakePosition(
       : adjustedSettings.boostToBps;
 
   const expectedDcaInAmount =
-    dca.debtToAddBaseUnit > 0 && eligibleForNextAutomationPeriod(dca.automation)
+    dca.debtToAddBaseUnit > 0 &&
+    eligibleForNextAutomationPeriod(dca.automation, currentUnixSeconds())
       ? dca.debtToAddBaseUnit -
         BigInt(
           Math.round(
@@ -265,23 +296,23 @@ describe("Rebalance tests", async () => {
   });
 
   it("Standard rebalance with target rate", async () => {
-    const client = new SolautoMarginfiClient(
-      process.env.HELIUS_API_KEY ?? "",
-      true
-    );
-    await client.initialize({
-      positionId: 1,
-      signer,
-      supplyMint: new PublicKey(NATIVE_MINT),
-      debtMint: new PublicKey(MARGINFI_ACCOUNTS.USDC.mint),
-    });
-
-    client.livePositionUpdates.new({
-      type: "supply",
-      value: BigInt(10000000000),
+    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([]),
     });
-    client.solautoPositionState = await client.getFreshPositionState();
-    client.solautoPositionState!.lastUpdated = BigInt(currentUnixSeconds());
 
     assertAccurateRebalance(client, 5000, 5000);
     assertAccurateRebalance(client, 1000, 1000);
@@ -393,14 +424,14 @@ describe("Rebalance tests", async () => {
   it("Rebalance DCA in", async () => {
     const settings: SolautoSettingsParameters = {
       automation: {
-        targetPeriods: 4,
+        targetPeriods: 3,
         periodsPassed: 0,
         intervalSeconds: BigInt(5),
         unixStartDate: BigInt(currentUnixSeconds()),
         padding1: [],
         padding: new Uint8Array([]),
       },
-      targetBoostToBps: 0,
+      targetBoostToBps: 5000,
       boostGap: 1000,
       boostToBps: 4000,
       repayGap: 1000,