@haven-fi/solauto-sdk 1.0.582 → 1.0.583

package/dist/utils/numberUtils.js

@@ -8,6 +8,8 @@ exports.calcTotalSupply = calcTotalSupply;
 exports.calcTotalDebt = calcTotalDebt;
 exports.debtLiquidityUsdAvailable = debtLiquidityUsdAvailable;
 exports.supplyLiquidityUsdDepositable = supplyLiquidityUsdDepositable;
+exports.fromRoundedUsdValue = fromRoundedUsdValue;
+exports.toRoundedUsdValue = toRoundedUsdValue;
 exports.getLiqUtilzationRateBps = getLiqUtilzationRateBps;
 exports.toBaseUnit = toBaseUnit;
 exports.fromBaseUnit = fromBaseUnit;
@@ -16,21 +18,19 @@ exports.toBps = toBps;
 exports.bytesToI80F48 = bytesToI80F48;
 exports.uint8ArrayToBigInt = uint8ArrayToBigInt;
 exports.getDebtAdjustmentUsd = getDebtAdjustmentUsd;
-exports.getSolautoFeesBps = getSolautoFeesBps;
 exports.getMaxLiqUtilizationRateBps = getMaxLiqUtilizationRateBps;
 exports.maxRepayFromBps = maxRepayFromBps;
 exports.maxRepayToBps = maxRepayToBps;
 exports.maxBoostToBps = maxBoostToBps;
 const constants_1 = require("../constants");
-const generated_1 = require("../generated");
 function calcNetWorthUsd(state) {
-    return fromBaseUnit(state?.netWorth.baseAmountUsdValue ?? BigInt(0), constants_1.USD_DECIMALS);
+    return fromRoundedUsdValue(state?.netWorth.baseAmountUsdValue ?? BigInt(0));
 }
 function calcSupplyUsd(state) {
-    return fromBaseUnit(state?.supply.amountUsed.baseAmountUsdValue ?? BigInt(0), constants_1.USD_DECIMALS);
+    return fromRoundedUsdValue(state?.supply.amountUsed.baseAmountUsdValue ?? BigInt(0));
 }
 function calcDebtUsd(state) {
-    return fromBaseUnit(state?.debt.amountUsed.baseAmountUsdValue ?? BigInt(0), constants_1.USD_DECIMALS);
+    return fromRoundedUsdValue(state?.debt.amountUsed.baseAmountUsdValue ?? BigInt(0));
 }
 function calcNetWorth(state) {
     return fromBaseUnit(state?.netWorth.baseUnit ?? BigInt(0), state?.supply.decimals ?? 1);
@@ -42,10 +42,16 @@ function calcTotalDebt(state) {
     return fromBaseUnit(state?.debt.amountUsed.baseUnit ?? BigInt(0), state?.debt.decimals ?? 1);
 }
 function debtLiquidityUsdAvailable(state) {
-    return fromBaseUnit(state?.debt.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0), constants_1.USD_DECIMALS);
+    return fromRoundedUsdValue(state?.debt.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0));
 }
 function supplyLiquidityUsdDepositable(state) {
-    return fromBaseUnit(state?.supply.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0), constants_1.USD_DECIMALS);
+    return fromRoundedUsdValue(state?.supply.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0));
+}
+function fromRoundedUsdValue(number) {
+    return fromBaseUnit(number, constants_1.USD_DECIMALS);
+}
+function toRoundedUsdValue(number) {
+    return toBaseUnit(number, constants_1.USD_DECIMALS);
 }
 function getLiqUtilzationRateBps(supplyUsd, debtUsd, liqThresholdBps) {
     if (supplyUsd === 0 || debtUsd === 0) {
@@ -105,47 +111,6 @@ function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtil
         (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
     return debtAdjustmentUsd;
 }
-function getSolautoFeesBps(isReferred, targetLiqUtilizationRateBps, positionNetWorthUsd, rebalanceDirection) {
-    const minSize = 10000; // Minimum position size
-    const maxSize = 250000; // Maximum position size
-    const maxFeeBps = 50; // Fee in basis points for minSize (0.5%)
-    const minFeeBps = 25; // Fee in basis points for maxSize (0.25%)
-    const k = 1.5;
-    if (targetLiqUtilizationRateBps !== undefined &&
-        targetLiqUtilizationRateBps === 0) {
-        return {
-            solauto: 0,
-            referrer: 0,
-            total: 0,
-        };
-    }
-    let feeBps = 0;
-    if (targetLiqUtilizationRateBps !== undefined ||
-        rebalanceDirection === generated_1.RebalanceDirection.Repay) {
-        feeBps = 25;
-    }
-    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 - Math.pow(t, k)));
-    }
-    let referrer = 0;
-    if (isReferred) {
-        feeBps *= 0.9;
-        referrer = Math.floor(feeBps * 0.15);
-    }
-    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

package/dist/utils/solanaUtils.js

@@ -29,8 +29,8 @@ const accountUtils_1 = require("./accountUtils");
 const generalUtils_1 = require("./generalUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
 const types_1 = require("../types");
-const solauto_1 = require("./solauto");
 const constants_1 = require("../constants");
+const solautoUtils_1 = require("./solautoUtils");
 function buildHeliusApiUrl(heliusApiKey) {
     return `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`;
 }
@@ -44,7 +44,7 @@ function getSolanaRpcConnection(rpcUrl, programId = constants_1.SOLAUTO_PROD_PRO
     });
     const umi = (0, umi_bundle_defaults_1.createUmi)(connection).use({
         install(umi) {
-            umi.programs.add((0, solauto_1.createDynamicSolautoProgram)(programId), false);
+            umi.programs.add((0, solautoUtils_1.createDynamicSolautoProgram)(programId), false);
         },
     });
     return [connection, umi];

package/dist/utils/{solauto/generalUtils.d.ts → solautoUtils.d.ts}

@@ -1,29 +1,18 @@
 import { PublicKey } from "@solana/web3.js";
 import { Program, Umi } from "@metaplex-foundation/umi";
-import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, PositionType, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../../generated";
-import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
+import { AutomationSettings, DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, PositionType, SolautoRebalanceType, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../generated";
+import { SolautoPositionDetails } from "../types/solauto";
 import { QuoteResponse } from "@jup-ag/api";
+import { SolautoClient, SolautoMarginfiClient, TxHandlerProps } from "../services";
 export declare function createDynamicSolautoProgram(programId: PublicKey): Program;
 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 sufficientLiquidityToBoost(positionState: PositionState, positionSettings: SolautoSettingsParameters | undefined, positionDca: DCASettings | undefined, supplyMintPrice: number, debtMintPrice: number): boolean;
-export declare function eligibleForRebalance(positionState: PositionState, positionSettings: SolautoSettingsParameters | undefined, positionDca: DCASettings | undefined, currentUnixTime: number, supplyMintPrice: number, debtMintPrice: number, bpsDistanceThreshold?: number): RebalanceAction | undefined;
-export declare function eligibleForRefresh(positionState: PositionState, positionSettings: SolautoSettingsParameters, currentUnixTime: number): boolean;
 export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey, positionTypeFilter?: PositionType): 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, positionTypeFilter?: PositionType): Promise<SolautoPositionDetails[]>;
 export declare function positionStateWithLatestPrices(state: PositionState, supplyPrice?: number, debtPrice?: number): Promise<PositionState>;
-interface AssetProps {
-    mint: PublicKey;
-    price?: number;
-    amountUsed?: number;
-    amountCanBeUsed?: number;
-}
-export declare function createFakePositionState(supply: AssetProps, debt: AssetProps, maxLtvBps: number, liqThresholdBps: number): PositionState;
-export declare function createSolautoSettings(settings: SolautoSettingsParametersInpArgs): SolautoSettingsParameters;
 type ContextAdjustment = {
     type: "supply";
     value: bigint;
@@ -53,7 +42,7 @@ export declare class ContextUpdates {
     supplyAdjustment: bigint;
     debtAdjustment: bigint;
     settings: SolautoSettingsParameters | undefined;
-    activeDca: DCASettings | undefined;
+    dca: DCASettings | undefined;
     dcaInBalance?: {
         amount: bigint;
         tokenType: TokenType;
@@ -64,5 +53,9 @@ export declare class ContextUpdates {
     reset(): void;
     positionUpdates(): boolean;
 }
+export declare function getClient(lendingPlatform: LendingPlatform, txHandlerProps: TxHandlerProps): SolautoMarginfiClient | undefined;
+export declare function isMarginfiClient(client: SolautoClient): client is SolautoMarginfiClient;
+export declare function hasFirstRebalance(rebalanceType: SolautoRebalanceType): boolean;
+export declare function hasLastRebalance(rebalanceType: SolautoRebalanceType): boolean;
 export {};
-//# sourceMappingURL=generalUtils.d.ts.map
+//# sourceMappingURL=solautoUtils.d.ts.map

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

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

package/dist/utils/{solauto/generalUtils.js → solautoUtils.js}

@@ -5,28 +5,26 @@ exports.createDynamicSolautoProgram = createDynamicSolautoProgram;
 exports.nextAutomationPeriodTimestamp = nextAutomationPeriodTimestamp;
 exports.eligibleForNextAutomationPeriod = eligibleForNextAutomationPeriod;
 exports.getUpdatedValueFromAutomation = getUpdatedValueFromAutomation;
-exports.getAdjustedSettingsFromAutomation = getAdjustedSettingsFromAutomation;
-exports.sufficientLiquidityToBoost = sufficientLiquidityToBoost;
-exports.eligibleForRebalance = eligibleForRebalance;
-exports.eligibleForRefresh = eligibleForRefresh;
 exports.getSolautoManagedPositions = getSolautoManagedPositions;
 exports.getAllReferralStates = getAllReferralStates;
 exports.getReferralsByUser = getReferralsByUser;
 exports.getAllPositionsByAuthority = getAllPositionsByAuthority;
 exports.positionStateWithLatestPrices = positionStateWithLatestPrices;
-exports.createFakePositionState = createFakePositionState;
-exports.createSolautoSettings = createSolautoSettings;
+exports.getClient = getClient;
+exports.isMarginfiClient = isMarginfiClient;
+exports.hasFirstRebalance = hasFirstRebalance;
+exports.hasLastRebalance = hasLastRebalance;
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
-const generated_1 = require("../../generated");
-const generalUtils_1 = require("../generalUtils");
-const numberUtils_1 = require("../numberUtils");
-const accountUtils_1 = require("../accountUtils");
+const generated_1 = require("../generated");
+const accountUtils_1 = require("./accountUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
-const constants_1 = require("../../constants");
-const marginfiUtils_1 = require("../marginfiUtils");
-const priceUtils_1 = require("../priceUtils");
-const rebalanceUtils_1 = require("./rebalanceUtils");
+const constants_1 = require("../constants");
+const marginfiUtils_1 = require("./marginfiUtils");
+const solautoPosition_1 = require("../solautoPosition");
+const services_1 = require("../services");
+const numberUtils_1 = require("./numberUtils");
+const priceUtils_1 = require("./priceUtils");
 function createDynamicSolautoProgram(programId) {
     return {
         name: "solauto",
@@ -64,69 +62,6 @@ function getUpdatedValueFromAutomation(currValue, targetValue, automation, curre
     const newValue = currValue - currRateDiff * progressPct;
     return newValue;
 }
-function getAdjustedSettingsFromAutomation(settings, currentUnixTime) {
-    const boostToBps = settings.automation.targetPeriods > 0 &&
-        eligibleForNextAutomationPeriod(settings.automation, currentUnixTime)
-        ? getUpdatedValueFromAutomation(settings.boostToBps, settings.targetBoostToBps, settings.automation, currentUnixTime)
-        : settings.boostToBps;
-    return {
-        ...settings,
-        boostToBps,
-    };
-}
-function sufficientLiquidityToBoost(positionState, positionSettings, positionDca, supplyMintPrice, debtMintPrice) {
-    const limitsUpToDate = positionState.supply.amountCanBeUsed.baseUnit > BigInt(0) ||
-        positionState.debt.amountCanBeUsed.baseUnit > BigInt(0);
-    if (limitsUpToDate) {
-        const values = (0, rebalanceUtils_1.getRebalanceValues)(positionState, positionSettings, positionDca, (0, generalUtils_1.currentUnixSeconds)(), supplyMintPrice, debtMintPrice);
-        const debtAvailable = (0, numberUtils_1.debtLiquidityUsdAvailable)(positionState);
-        const supplyDepositable = (0, numberUtils_1.supplyLiquidityUsdDepositable)(positionState);
-        const sufficientLiquidity = debtAvailable * 0.95 > values.debtAdjustmentUsd &&
-            supplyDepositable * 0.95 > values.debtAdjustmentUsd;
-        if (!sufficientLiquidity) {
-            (0, generalUtils_1.consoleLog)("Insufficient liquidity to further boost");
-        }
-        return sufficientLiquidity;
-    }
-    return true;
-}
-function eligibleForRebalance(positionState, positionSettings, positionDca, currentUnixTime, supplyMintPrice, debtMintPrice, bpsDistanceThreshold = 0) {
-    if (!positionSettings) {
-        return undefined;
-    }
-    if (positionDca &&
-        positionDca.automation.targetPeriods > 0 &&
-        eligibleForNextAutomationPeriod(positionDca.automation, currentUnixTime)) {
-        return "dca";
-    }
-    if (positionState.supply.amountUsed.baseUnit === BigInt(0)) {
-        return undefined;
-    }
-    const boostToBps = eligibleForRefresh(positionState, positionSettings, currentUnixTime) &&
-        positionSettings.automation.targetPeriods > 0
-        ? getUpdatedValueFromAutomation(positionSettings.boostToBps, positionSettings.targetBoostToBps, positionSettings.automation, currentUnixTime)
-        : positionSettings.boostToBps;
-    const repayFrom = positionSettings.repayToBps + positionSettings.repayGap;
-    const boostFrom = boostToBps - positionSettings.boostGap;
-    if (positionState.liqUtilizationRateBps - boostFrom <= bpsDistanceThreshold) {
-        const sufficientLiquidity = sufficientLiquidityToBoost(positionState, positionSettings, positionDca, supplyMintPrice, debtMintPrice);
-        return sufficientLiquidity ? "boost" : undefined;
-    }
-    else if (repayFrom - positionState.liqUtilizationRateBps <=
-        bpsDistanceThreshold) {
-        return "repay";
-    }
-    return undefined;
-}
-function eligibleForRefresh(positionState, positionSettings, currentUnixTime) {
-    if (positionSettings.automation.targetPeriods > 0) {
-        return eligibleForNextAutomationPeriod(positionSettings.automation, currentUnixTime);
-    }
-    else {
-        return ((0, generalUtils_1.currentUnixSeconds)() - Number(positionState.lastUpdated) >
-            60 * 60 * 24 * 7);
-    }
-}
 async function getSolautoManagedPositions(umi, authority, positionTypeFilter) {
     // bump: [u8; 1]
     // position_id: [u8; 1]
@@ -288,117 +223,31 @@ async function positionStateWithLatestPrices(state, supplyPrice, debtPrice) {
         ...state,
         liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, state.liqThresholdBps),
         netWorth: {
-            baseUnit: (0, numberUtils_1.toBaseUnit)(supplyPrice > 0 ? (supplyUsd - debtUsd) / supplyPrice : 0, state.supply.decimals),
-            baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd - debtUsd, constants_1.USD_DECIMALS),
+            baseUnit: (0, numberUtils_1.toBaseUnit)(supplyUsd > 0 ? (supplyUsd - debtUsd) / supplyPrice : 0, state.supply.decimals),
+            baseAmountUsdValue: (0, numberUtils_1.toRoundedUsdValue)(supplyUsd - debtUsd),
         },
         supply: {
             ...state.supply,
             amountCanBeUsed: {
                 ...state.supply.amountCanBeUsed,
-                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(state.supply.amountCanBeUsed.baseUnit, state.supply.decimals) * supplyPrice, constants_1.USD_DECIMALS),
+                baseAmountUsdValue: (0, numberUtils_1.toRoundedUsdValue)((0, numberUtils_1.fromBaseUnit)(state.supply.amountCanBeUsed.baseUnit, state.supply.decimals) * supplyPrice),
             },
             amountUsed: {
                 ...state.supply.amountUsed,
-                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd, constants_1.USD_DECIMALS),
+                baseAmountUsdValue: (0, numberUtils_1.toRoundedUsdValue)(supplyUsd),
             },
         },
         debt: {
             ...state.debt,
             amountCanBeUsed: {
                 ...state.debt.amountCanBeUsed,
-                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(state.debt.amountCanBeUsed.baseUnit, state.debt.decimals) * debtPrice, constants_1.USD_DECIMALS),
+                baseAmountUsdValue: (0, numberUtils_1.toRoundedUsdValue)((0, numberUtils_1.fromBaseUnit)(state.debt.amountCanBeUsed.baseUnit, state.debt.decimals) * debtPrice),
             },
             amountUsed: {
                 ...state.debt.amountUsed,
-                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(debtUsd, constants_1.USD_DECIMALS),
-            },
-        },
-    };
-}
-function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
-    const supplyDecimals = constants_1.TOKEN_INFO[supply.mint.toString()].decimals;
-    const debtDecimals = constants_1.TOKEN_INFO[debt.mint.toString()].decimals;
-    const supplyUsd = (supply.amountUsed ?? 0) * (supply.price ?? 0);
-    const debtUsd = (debt.amountUsed ?? 0) * (debt.price ?? 0);
-    return {
-        liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, liqThresholdBps),
-        supply: {
-            amountUsed: {
-                baseUnit: (0, numberUtils_1.toBaseUnit)(supply.amountUsed ?? 0, supplyDecimals),
-                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd, constants_1.USD_DECIMALS),
+                baseAmountUsdValue: (0, numberUtils_1.toRoundedUsdValue)(debtUsd),
             },
-            amountCanBeUsed: {
-                baseUnit: (0, numberUtils_1.toBaseUnit)(supply.amountCanBeUsed ?? 0, supplyDecimals),
-                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)((supply.amountCanBeUsed ?? 0) * (supply.price ?? 0), constants_1.USD_DECIMALS),
-            },
-            baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(supply.price ?? 0, constants_1.USD_DECIMALS),
-            borrowFeeBps: 0,
-            decimals: supplyDecimals,
-            flashLoanFeeBps: 0,
-            mint: (0, umi_1.publicKey)(supply.mint),
-            padding1: [],
-            padding2: [],
-            padding: new Uint8Array([]),
-        },
-        debt: {
-            amountUsed: {
-                baseUnit: (0, numberUtils_1.toBaseUnit)(debt.amountUsed ?? 0, debtDecimals),
-                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(debtUsd, constants_1.USD_DECIMALS),
-            },
-            amountCanBeUsed: {
-                baseUnit: (0, numberUtils_1.toBaseUnit)(debt.amountCanBeUsed ?? 0, debtDecimals),
-                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)((debt.amountCanBeUsed ?? 0) * (debt.price ?? 0), constants_1.USD_DECIMALS),
-            },
-            baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(debt.price ?? 0, constants_1.USD_DECIMALS),
-            borrowFeeBps: 0,
-            decimals: debtDecimals,
-            flashLoanFeeBps: 0,
-            mint: (0, umi_1.publicKey)(debt.mint),
-            padding1: [],
-            padding2: [],
-            padding: new Uint8Array([]),
-        },
-        netWorth: {
-            baseUnit: supply.price
-                ? (0, numberUtils_1.toBaseUnit)((supplyUsd - debtUsd) / supply.price, supplyDecimals)
-                : BigInt(0),
-            baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd - debtUsd, constants_1.USD_DECIMALS),
         },
-        maxLtvBps,
-        liqThresholdBps,
-        lastUpdated: BigInt((0, generalUtils_1.currentUnixSeconds)()),
-        padding1: [],
-        padding2: [],
-        padding: [],
-    };
-}
-function createSolautoSettings(settings) {
-    return {
-        automation: (0, umi_1.isOption)(settings.automation) && (0, umi_1.isSome)(settings.automation)
-            ? {
-                ...settings.automation.value,
-                intervalSeconds: BigInt(settings.automation.value.intervalSeconds),
-                unixStartDate: BigInt(settings.automation.value.unixStartDate),
-                padding: new Uint8Array([]),
-                padding1: [],
-            }
-            : {
-                targetPeriods: 0,
-                periodsPassed: 0,
-                intervalSeconds: BigInt(0),
-                unixStartDate: BigInt(0),
-                padding: new Uint8Array([]),
-                padding1: [],
-            },
-        targetBoostToBps: (0, umi_1.isOption)(settings.targetBoostToBps) && (0, umi_1.isSome)(settings.targetBoostToBps)
-            ? settings.targetBoostToBps.value
-            : 0,
-        boostGap: settings.boostGap,
-        boostToBps: settings.boostToBps,
-        repayGap: settings.repayGap,
-        repayToBps: settings.repayToBps,
-        padding: new Uint8Array([]),
-        padding1: [],
     };
 }
 class ContextUpdates {
@@ -406,7 +255,7 @@ class ContextUpdates {
         this.supplyAdjustment = BigInt(0);
         this.debtAdjustment = BigInt(0);
         this.settings = undefined;
-        this.activeDca = undefined;
+        this.dca = undefined;
         this.dcaInBalance = undefined;
         this.cancellingDca = undefined;
         this.jupSwap = undefined;
@@ -420,11 +269,11 @@ class ContextUpdates {
         }
         else if (update.type === "settings") {
             const settings = update.value;
-            this.settings = createSolautoSettings(settings);
+            this.settings = (0, solautoPosition_1.createSolautoSettings)(settings);
         }
         else if (update.type === "dca") {
             const dca = update.value;
-            this.activeDca = {
+            this.dca = {
                 automation: {
                     ...dca.automation,
                     intervalSeconds: BigInt(dca.automation.intervalSeconds),
@@ -451,7 +300,7 @@ class ContextUpdates {
         this.supplyAdjustment = BigInt(0);
         this.debtAdjustment = BigInt(0);
         this.settings = undefined;
-        this.activeDca = undefined;
+        this.dca = undefined;
         this.dcaInBalance = undefined;
         this.cancellingDca = undefined;
     }
@@ -464,3 +313,29 @@ class ContextUpdates {
     }
 }
 exports.ContextUpdates = ContextUpdates;
+function getClient(lendingPlatform, txHandlerProps) {
+    if (lendingPlatform === generated_1.LendingPlatform.Marginfi) {
+        return new services_1.SolautoMarginfiClient(txHandlerProps);
+    }
+    else {
+        // TODO: PF
+    }
+}
+function isMarginfiClient(client) {
+    return client.lendingPlatform == generated_1.LendingPlatform.Marginfi;
+}
+// TODO: PF
+function hasFirstRebalance(rebalanceType) {
+    return [
+        generated_1.SolautoRebalanceType.Regular,
+        generated_1.SolautoRebalanceType.DoubleRebalanceWithFL,
+        generated_1.SolautoRebalanceType.FLRebalanceThenSwap,
+    ].includes(rebalanceType);
+}
+function hasLastRebalance(rebalanceType) {
+    return [
+        generated_1.SolautoRebalanceType.Regular,
+        generated_1.SolautoRebalanceType.DoubleRebalanceWithFL,
+        generated_1.SolautoRebalanceType.FLSwapThenRebalance,
+    ].includes(rebalanceType);
+}

package/local/createTokenAccounts.ts

@@ -1,9 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import {
-  ALL_SUPPORTED_TOKENS,
-  SOLAUTO_FEES_WALLET,
-  SOLAUTO_MANAGER,
-} from "../src/constants";
+import { ALL_SUPPORTED_TOKENS, SOLAUTO_FEES_WALLET } from "../src/constants";
 import {
   buildHeliusApiUrl,
   createAssociatedTokenAccountUmiIx,

package/local/logPositions.ts

@@ -1,26 +1,15 @@
-import { publicKey } from "@metaplex-foundation/umi";
 import {
   buildIronforgeApiUrl,
-  calcNetWorthUsd,
-  calcSupplyUsd,
-  currentUnixSeconds,
-  eligibleForRebalance,
   fetchTokenPrices,
+  getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
-  PositionState,
-  positionStateWithLatestPrices,
-  retryWithExponentialBackoff,
-  safeFetchAllSolautoPosition,
   safeGetPrice,
   SOLAUTO_PROD_PROGRAM,
-  solautoStrategyName,
 } from "../src";
 import { PublicKey } from "@solana/web3.js";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import path from "path";
 import { config } from "dotenv";
-import { getBatches } from "./shared";
 
 config({ path: path.join(__dirname, ".env") });
 
@@ -102,23 +91,12 @@ async function main(filterWhitelist: boolean) {
     );
   }
 
-  const batches = getBatches(positions, 30);
-
-  const solautoPositionsData = (
-    await Promise.all(
-      batches.map(async (pubkeys) => {
-        return retryWithExponentialBackoff(
-          async () =>
-            await safeFetchAllSolautoPosition(
-              umi,
-              pubkeys.map((x) => publicKey(x.publicKey!))
-            )
-        );
-      })
+  const positionsEx = (
+    await getPositionExBulk(
+      umi,
+      positions.map((x) => new PublicKey(x.publicKey!))
     )
-  )
-    .flat()
-    .sort((a, b) => calcNetWorthUsd(a.state) - calcNetWorthUsd(b.state));
+  ).sort((a, b) => a.netWorthUsd() - b.netWorthUsd());
 
   const tokensUsed = Array.from(
     new Set(
@@ -128,49 +106,25 @@ async function main(filterWhitelist: boolean) {
       ])
     )
   );
-
-  const tokenBatches = getBatches(tokensUsed, 15);
-  await Promise.all(
-    tokenBatches.map(async (batch) => {
-      await fetchTokenPrices(batch.map((x) => new PublicKey(x)));
-    })
-  );
+  await fetchTokenPrices(tokensUsed.map((x) => new PublicKey(x)));
 
   console.log("\n\n");
 
-  const latestStates: PositionState[] = [];
   let unhealthyPositions = 0;
   let awaitingBoostPositions = 0;
 
-  for (const pos of solautoPositionsData) {
-    const strategy = solautoStrategyName(
-      toWeb3JsPublicKey(pos.state.supply.mint),
-      toWeb3JsPublicKey(pos.state.debt.mint)
+  for (const pos of positionsEx) {
+    await pos.updateWithLatestPrices(
+      safeGetPrice(pos.state().supply.mint),
+      safeGetPrice(pos.state().debt.mint)
     );
 
-    const latestState = await positionStateWithLatestPrices(
-      pos.state,
-      safeGetPrice(pos.state.supply.mint),
-      safeGetPrice(pos.state.debt.mint)
-    );
-    latestStates.push(latestState);
-
-    const actionToTake = eligibleForRebalance(
-      latestState,
-      pos.position.settingParams,
-      pos.position.dca,
-      currentUnixSeconds(),
-      safeGetPrice(latestState.supply.mint)!,
-      safeGetPrice(latestState.debt.mint)!,
-      0
-    );
+    const actionToTake = pos.eligibleForRebalance(0);
 
-    const repayFrom =
-      pos.position.settingParams.repayToBps +
-      pos.position.settingParams.repayGap;
+    const repayFrom = pos.settings()!.repayToBps + pos.settings()!.repayGap;
     const unhealthy = actionToTake === "repay";
     const healthText = unhealthy
-      ? `(Unhealthy: ${latestState.liqUtilizationRateBps - repayFrom}bps)`
+      ? `(Unhealthy: ${pos.state().liqUtilizationRateBps - repayFrom}bps)`
       : "";
     if (unhealthy) {
       unhealthyPositions += 1;
@@ -184,30 +138,30 @@ async function main(filterWhitelist: boolean) {
 
     console.log(
       pos.publicKey.toString(),
-      `(${pos.authority.toString()} ${pos.positionId})`
+      `(${pos.data().authority!.toString()} ${pos.data().positionId})`
     );
     console.log(
-      `${strategy}: $${formatNumber(calcNetWorthUsd(latestState), 2, 10000, 2)} ${healthText} ${boostText}`
+      `${pos.strategyName()}: $${formatNumber(pos.netWorthUsd(), 2, 10000, 2)} ${healthText} ${boostText}`
     );
   }
 
   console.log(
     "\nTotal positions:",
-    solautoPositionsData.length,
+    positionsEx.length,
     unhealthyPositions ? ` (unhealthy: ${unhealthyPositions})` : "",
     awaitingBoostPositions ? ` (awaiting boost: ${awaitingBoostPositions})` : ""
   );
   console.log(
     "Total users:",
-    Array.from(new Set(solautoPositionsData.map((x) => x.authority.toString())))
+    Array.from(new Set(positionsEx.map((x) => x.data().authority!.toString())))
       .length
   );
 
-  const tvl = latestStates
-    .map((x) => calcSupplyUsd(x))
+  const tvl = positionsEx
+    .map((x) => x.supplyUsd())
     .reduce((acc, curr) => acc + curr, 0);
-  const netWorth = latestStates
-    .map((x) => calcNetWorthUsd(x))
+  const netWorth = positionsEx
+    .map((x) => x.netWorthUsd())
     .reduce((acc, curr) => acc + curr, 0);
 
   console.log(`TVL: $${formatNumber(tvl, 2, 10000, 2)}`);