@haven-fi/solauto-sdk 1.0.628 → 1.0.630

package/dist/solautoPosition/solautoPositionEx.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolautoPositionEx = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const generated_1 = require("../generated");
 const utils_1 = require("../utils");
@@ -23,103 +24,124 @@ class SolautoPositionEx {
         this._data = args.data;
         this.firstState = { ...args.data.state };
     }
-    exists() {
+    get exists() {
         return this._data.position !== undefined;
     }
-    authority() {
+    get authority() {
         return this._data.authority
             ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this._data.authority)
-            : undefined;
+            : web3_js_1.PublicKey.default;
     }
-    positionId() {
+    get positionId() {
         return this._data.positionId ? this._data.positionId[0] : undefined;
     }
-    strategyName() {
-        return (0, utils_1.solautoStrategyName)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().supply.mint), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().debt.mint));
+    get positionType() {
+        return this._data.positionType;
     }
-    data() {
+    get strategyName() {
+        return (0, utils_1.solautoStrategyName)(this.supplyMint, this.debtMint);
+    }
+    liqUtilizationRateBps(priceType) {
+        return (0, utils_1.getLiqUtilzationRateBps)(this.supplyUsd(priceType), this.debtUsd(priceType), this.state.liqThresholdBps);
+    }
+    get data() {
         return this._data;
     }
-    state() {
-        return this.data().state;
+    get state() {
+        return this.data.state;
+    }
+    get settings() {
+        return this.contextUpdates?.settings ?? this.data.position?.settings;
+    }
+    updateSettings(settings) {
+        this.data.position.settings = settings;
+    }
+    get dca() {
+        return this.contextUpdates?.dca ?? this.data.position?.dca;
+    }
+    updateDca(dca) {
+        this.data.position.dca = dca;
     }
-    settings() {
-        return this.contextUpdates?.settings ?? this.data().position?.settings;
+    get supplyMint() {
+        return (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state.supply.mint);
     }
-    dca() {
-        return this.contextUpdates?.dca ?? this.data().position?.dca;
+    get supplyMintInfo() {
+        return (0, utils_1.tokenInfo)(this.supplyMint);
     }
-    supplyMint() {
-        return (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().supply.mint);
+    get debtMint() {
+        return (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state.debt.mint);
     }
-    supplyMintInfo() {
-        return (0, utils_1.tokenInfo)(this.supplyMint());
+    get debtMintInfo() {
+        return (0, utils_1.tokenInfo)(this.debtMint);
     }
-    debtMint() {
-        return (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().debt.mint);
+    get boostToBps() {
+        return Math.min(this.settings?.boostToBps ?? 0, this.maxBoostToBps);
     }
-    debtMintInfo() {
-        return (0, utils_1.tokenInfo)(this.debtMint());
+    get maxBoostToBps() {
+        return (0, utils_1.maxBoostToBps)(this.state.maxLtvBps, this.state.liqThresholdBps);
     }
-    boostToBps() {
-        return Math.min(this.settings()?.boostToBps ?? 0, (0, utils_1.maxBoostToBps)(this.state().maxLtvBps, this.state().liqThresholdBps));
+    get boostFromBps() {
+        return this.boostToBps - (this.settings?.boostGap ?? 0);
     }
-    boostFromBps() {
-        return this.boostToBps() - (this.settings()?.boostGap ?? 0);
+    get repayToBps() {
+        return Math.min(this.settings?.repayToBps ?? 0, this.maxRepayToBps);
     }
-    repayToBps() {
-        return Math.min(this.settings()?.repayToBps ?? 0, (0, utils_1.maxRepayToBps)(this.state().maxLtvBps, this.state().liqThresholdBps));
+    get maxRepayToBps() {
+        return (0, utils_1.maxRepayToBps)(this.state.maxLtvBps, this.state.liqThresholdBps);
     }
-    repayFromBps() {
-        return ((this.settings()?.repayToBps ?? 0) + (this.settings()?.repayGap ?? 0));
+    get repayFromBps() {
+        return (this.settings?.repayToBps ?? 0) + (this.settings?.repayGap ?? 0);
     }
-    netWorth() {
-        return (0, utils_1.calcNetWorth)(this.state());
+    get maxRepayFromBps() {
+        return (0, utils_1.maxRepayFromBps)(this.state.maxLtvBps, this.state.liqThresholdBps);
     }
-    netWorthUsd() {
-        return (0, utils_1.calcNetWorthUsd)(this.state());
+    get netWorth() {
+        return (0, utils_1.calcNetWorth)(this.state);
     }
-    totalSupply() {
-        return (0, utils_1.calcTotalSupply)(this.state());
+    get netWorthUsd() {
+        return (0, utils_1.calcNetWorthUsd)(this.state);
     }
-    supplyUsd() {
-        const supplyPrice = (0, utils_1.safeGetPrice)(this.supplyMint());
+    get totalSupply() {
+        return (0, utils_1.calcTotalSupply)(this.state);
+    }
+    supplyUsd(priceType) {
+        const supplyPrice = (0, utils_1.safeGetPrice)(this.supplyMint, priceType);
         return supplyPrice
-            ? (0, utils_1.calcTotalSupply)(this.state()) * supplyPrice
-            : (0, utils_1.calcSupplyUsd)(this.state());
+            ? (0, utils_1.calcTotalSupply)(this.state) * supplyPrice
+            : (0, utils_1.calcSupplyUsd)(this.state);
     }
-    totalDebt() {
-        return (0, utils_1.calcTotalDebt)(this.state());
+    get totalDebt() {
+        return (0, utils_1.calcTotalDebt)(this.state);
     }
-    debtUsd() {
-        const debtPrice = (0, utils_1.safeGetPrice)(this.debtMint());
+    debtUsd(priceType) {
+        const debtPrice = (0, utils_1.safeGetPrice)(this.debtMint, priceType);
         return debtPrice
-            ? (0, utils_1.calcTotalDebt)(this.state()) * debtPrice
-            : (0, utils_1.calcDebtUsd)(this.state());
+            ? (0, utils_1.calcTotalDebt)(this.state) * debtPrice
+            : (0, utils_1.calcDebtUsd)(this.state);
     }
-    supplyLiquidityDepositable() {
-        return (0, utils_1.supplyLiquidityDepositable)(this.state());
+    get supplyLiquidityDepositable() {
+        return (0, utils_1.supplyLiquidityDepositable)(this.state);
     }
-    supplyLiquidityUsdDepositable() {
-        return (0, utils_1.supplyLiquidityUsdDepositable)(this.state());
+    get supplyLiquidityUsdDepositable() {
+        return (0, utils_1.supplyLiquidityUsdDepositable)(this.state);
     }
-    supplyLiquidityUsdAvailable() {
-        return (this.supplyLiquidityAvailable() * ((0, utils_1.safeGetPrice)(this.supplyMint()) ?? 0));
+    get supplyLiquidityUsdAvailable() {
+        return this.supplyLiquidityAvailable * ((0, utils_1.safeGetPrice)(this.supplyMint) ?? 0);
     }
-    debtLiquidityAvailable() {
-        return (0, utils_1.debtLiquidityAvailable)(this.state());
+    get debtLiquidityAvailable() {
+        return (0, utils_1.debtLiquidityAvailable)(this.state);
     }
-    debtLiquidityUsdAvailable() {
-        return (0, utils_1.debtLiquidityUsdAvailable)(this.state());
+    get debtLiquidityUsdAvailable() {
+        return (0, utils_1.debtLiquidityUsdAvailable)(this.state);
     }
     sufficientLiquidityToBoost() {
-        const limitsUpToDate = this.debtLiquidityUsdAvailable() !== 0 ||
-            this.supplyLiquidityUsdDepositable() !== 0;
+        const limitsUpToDate = this.debtLiquidityUsdAvailable !== 0 ||
+            this.supplyLiquidityUsdDepositable !== 0;
         if (limitsUpToDate) {
-            const { debtAdjustmentUsd } = (0, rebalance_1.getDebtAdjustment)(this.state().liqThresholdBps, { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() }, this.boostToBps(), { solauto: 50, lpBorrow: 50, flashLoan: 50 } // TODO: get true data here instead of magic numbers
+            const { debtAdjustmentUsd } = (0, rebalance_1.getDebtAdjustment)(this.state.liqThresholdBps, { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() }, this.boostToBps, { solauto: 50, lpBorrow: 50, flashLoan: 50 } // TODO: get true data here instead of magic numbers
             );
-            const sufficientLiquidity = this.debtLiquidityUsdAvailable() * 0.95 > debtAdjustmentUsd &&
-                this.supplyLiquidityUsdDepositable() * 0.95 > debtAdjustmentUsd;
+            const sufficientLiquidity = this.debtLiquidityUsdAvailable * 0.95 > debtAdjustmentUsd &&
+                this.supplyLiquidityUsdDepositable * 0.95 > debtAdjustmentUsd;
             if (!sufficientLiquidity) {
                 (0, utils_1.consoleLog)("Insufficient liquidity to further boost");
             }
@@ -128,28 +150,28 @@ class SolautoPositionEx {
         return true;
     }
     eligibleForRebalance(bpsDistanceThreshold = 0) {
-        if (!this.settings() || !this.supplyUsd()) {
+        if (!this.settings || !this.supplyUsd()) {
             return undefined;
         }
-        if (this.state().liqUtilizationRateBps - this.boostFromBps() <=
-            bpsDistanceThreshold) {
+        const realtimeLiqUtilRateBps = this.liqUtilizationRateBps(generated_1.PriceType.Realtime);
+        const emaLiqUtilRateBps = this.liqUtilizationRateBps(generated_1.PriceType.Ema);
+        if (this.repayFromBps - realtimeLiqUtilRateBps <= bpsDistanceThreshold) {
+            return "repay";
+        }
+        else if (realtimeLiqUtilRateBps - this.boostFromBps <= bpsDistanceThreshold ||
+            emaLiqUtilRateBps - this.boostFromBps <= bpsDistanceThreshold) {
             const sufficientLiquidity = this.sufficientLiquidityToBoost();
             return sufficientLiquidity ? "boost" : undefined;
         }
-        else if (this.repayFromBps() - this.state().liqUtilizationRateBps <=
-            bpsDistanceThreshold) {
-            return "repay";
-        }
         return undefined;
     }
     eligibleForRefresh() {
         if (this._data.selfManaged)
             return false;
-        return ((0, utils_1.currentUnixSeconds)() - Number(this.state().lastRefreshed) >
-            60 * 60 * 24 * 7);
+        return ((0, utils_1.currentUnixSeconds)() - Number(this.state.lastRefreshed) > 60 * 60 * 24 * 7);
     }
     canRefreshPositionState() {
-        if (Number(this.state().lastRefreshed) >
+        if (Number(this.state.lastRefreshed) >
             (0, utils_1.currentUnixSeconds)() - constants_1.MIN_POSITION_STATE_FRESHNESS_SECS &&
             !this.contextUpdates?.positionUpdates()) {
             return false;
@@ -157,48 +179,45 @@ class SolautoPositionEx {
         return true;
     }
     async utilizationRateBpsDrift() {
-        const supplyPrice = (0, utils_1.safeGetPrice)(this.state().supply.mint) ?? 0;
-        const debtPrice = (0, utils_1.safeGetPrice)(this.state().debt.mint) ?? 0;
+        const supplyPrice = (0, utils_1.safeGetPrice)(this.state.supply.mint) ?? 0;
+        const debtPrice = (0, utils_1.safeGetPrice)(this.state.debt.mint) ?? 0;
         const oldState = await (0, utils_1.positionStateWithLatestPrices)(this.firstState, supplyPrice, debtPrice);
-        const newState = await (0, utils_1.positionStateWithLatestPrices)(this.state(), supplyPrice, debtPrice);
+        const newState = await (0, utils_1.positionStateWithLatestPrices)(this.state, supplyPrice, debtPrice);
         return newState.liqUtilizationRateBps - oldState.liqUtilizationRateBps;
     }
     updateSupply(newSupplyUsd, supplyPrice) {
         this._data.state.supply.amountUsed.baseAmountUsdValue =
             (0, utils_1.toRoundedUsdValue)(newSupplyUsd);
-        this._data.state.supply.amountUsed.baseUnit = (0, utils_1.toBaseUnit)(newSupplyUsd / (supplyPrice ?? (0, utils_1.safeGetPrice)(this.supplyMint()) ?? 0), this.supplyMintInfo().decimals);
+        this._data.state.supply.amountUsed.baseUnit = (0, utils_1.toBaseUnit)(newSupplyUsd / (supplyPrice ?? (0, utils_1.safeGetPrice)(this.supplyMint) ?? 0), this.supplyMintInfo.decimals);
     }
     updateDebt(newDebtUsd, debtPrice) {
         this._data.state.debt.amountUsed.baseAmountUsdValue =
             (0, utils_1.toRoundedUsdValue)(newDebtUsd);
-        this._data.state.debt.amountUsed.baseUnit = (0, utils_1.toBaseUnit)(newDebtUsd / (debtPrice ?? (0, utils_1.safeGetPrice)(this.debtMint()) ?? 0), this.debtMintInfo().decimals);
+        this._data.state.debt.amountUsed.baseUnit = (0, utils_1.toBaseUnit)(newDebtUsd / (debtPrice ?? (0, utils_1.safeGetPrice)(this.debtMint) ?? 0), this.debtMintInfo.decimals);
     }
     updateNetWorth(supplyPrice) {
         const netWorthUsd = this.supplyUsd() - this.debtUsd();
         this._data.state.netWorth.baseAmountUsdValue =
             (0, utils_1.toRoundedUsdValue)(netWorthUsd);
-        this._data.state.netWorth.baseUnit = (0, utils_1.toBaseUnit)(netWorthUsd / (supplyPrice ?? (0, utils_1.safeGetPrice)(this.supplyMint()) ?? 0), this.supplyMintInfo().decimals);
+        this._data.state.netWorth.baseUnit = (0, utils_1.toBaseUnit)(netWorthUsd / (supplyPrice ?? (0, utils_1.safeGetPrice)(this.supplyMint) ?? 0), this.supplyMintInfo.decimals);
     }
-    updateLiqUtilizationRate() {
-        this._data.state.liqUtilizationRateBps = (0, utils_1.getLiqUtilzationRateBps)(this.supplyUsd(), this.debtUsd(), this.state().liqThresholdBps);
+    updateLiqUtilizationRate(priceType) {
+        this._data.state.liqUtilizationRateBps = (0, utils_1.getLiqUtilzationRateBps)(this.supplyUsd(priceType), this.debtUsd(priceType), this.state.liqThresholdBps);
     }
-    async updateWithLatestPrices(supplyPrice, debtPrice) {
-        if (!supplyPrice || !debtPrice) {
-            [supplyPrice, debtPrice] = await (0, utils_1.fetchTokenPrices)([
-                this.supplyMint(),
-                this.debtMint(),
-            ]);
+    async updateWithLatestPrices(data) {
+        if (!data.supplyPrice || !data.debtPrice) {
+            [data.supplyPrice, data.debtPrice] = await (0, utils_1.fetchTokenPrices)([this.supplyMint, this.debtMint], data.priceType);
         }
-        const supplyUsd = this.totalSupply() * supplyPrice;
-        const debtUsd = this.totalDebt() * debtPrice;
-        this.updateSupply(supplyUsd, supplyPrice);
-        this.updateDebt(debtUsd, debtPrice);
-        this.updateNetWorth(supplyPrice);
+        const supplyUsd = this.totalSupply * data.supplyPrice;
+        const debtUsd = this.totalDebt * data.debtPrice;
+        this.updateSupply(supplyUsd, data.supplyPrice);
+        this.updateDebt(debtUsd, data.debtPrice);
+        this.updateNetWorth(data.supplyPrice);
         this.updateLiqUtilizationRate();
     }
     simulateRebalance(unixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps) {
         this._data.state.lastRefreshed = BigInt(unixTime);
-        const rebalance = (0, rebalance_1.getRebalanceValues)(this, targetLiqUtilizationRateBps, rebalance_1.SolautoFeesBps.create(true, targetLiqUtilizationRateBps, this.netWorthUsd()));
+        const rebalance = (0, rebalance_1.getRebalanceValues)(this, generated_1.PriceType.Realtime, targetLiqUtilizationRateBps, rebalance_1.SolautoFeesBps.create(true, targetLiqUtilizationRateBps, this.netWorthUsd));
         this.updateSupply(rebalance.endResult.supplyUsd, supplyPrice);
         this.updateDebt(rebalance.endResult.debtUsd, debtPrice);
         this.updateNetWorth(supplyPrice);

package/dist/types/solauto.d.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { LendingPlatform, PositionType, SolautoRebalanceType, TokenType } from "../generated";
+import { LendingPlatform, PositionType, PriceType, SolautoRebalanceType, TokenType } from "../generated";
 import { TransactionBuilder } from "@metaplex-foundation/umi";
 import { RebalanceValues } from "../services/rebalance";
 import { QuoteResponse } from "@jup-ag/api";
@@ -44,6 +44,7 @@ export interface RebalanceDetails {
     flashLoan?: FlashLoanDetails;
     swapQuote: QuoteResponse;
     targetLiqUtilizationRateBps?: number;
+    priceType: PriceType;
 }
 export type ProgramEnv = "Prod" | "Staging";
 //# sourceMappingURL=solauto.d.ts.map

package/dist/types/solauto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,YAAY,EACZ,oBAAoB,EACpB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,wBAAwB,EAEhC,kBAAkB,EAAE,CAAC;AAE1B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,EAAE,SAAS,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,oBAAoB,CAAC;IACpC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC"}
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,YAAY,EACZ,SAAS,EACT,oBAAoB,EACpB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,wBAAwB,EAEhC,kBAAkB,EAAE,CAAC;AAE1B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,EAAE,SAAS,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,oBAAoB,CAAC;IACpC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC"}

package/dist/utils/instructionUtils.js

@@ -84,10 +84,10 @@ function rebalance(client, targetLiqUtilizationRateBps) {
 function swapThenDeposit(client, depositMint, depositAmountBaseUnit) {
     return [
         new services_1.TransactionItem(async () => {
-            const memeSwap = (0, generalUtils_1.tokenInfo)(client.pos.supplyMint()).isMeme;
+            const memeSwap = (0, generalUtils_1.tokenInfo)(client.pos.supplyMint).isMeme;
             const swapInput = {
                 inputMint: depositMint,
-                outputMint: client.pos.supplyMint(),
+                outputMint: client.pos.supplyMint,
                 amount: depositAmountBaseUnit,
                 exactIn: true,
                 slippageBps: memeSwap ? 300 : 50,

package/dist/utils/marginfiUtils.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { Program, Umi } from "@metaplex-foundation/umi";
 import { ProgramEnv, MarginfiAssetAccounts } from "../types";
-import { PositionState } from "../generated";
+import { PositionState, PriceType } from "../generated";
 import { MarginfiBankAccountsMap } from "../constants";
 import { Bank, MarginfiAccount } from "../marginfi-sdk";
 import { ContextUpdates } from "./solautoUtils";
@@ -49,7 +49,7 @@ type BanksCache = {
 export declare function getMarginfiAccountPositionState(umi: Umi, lpUserAccount: {
     pk?: PublicKey;
     data?: MarginfiAccount | null;
-}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, programEnv?: ProgramEnv, contextUpdates?: ContextUpdates): Promise<{
+}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, programEnv?: ProgramEnv, contextUpdates?: ContextUpdates, priceType?: PriceType): Promise<{
     supplyBank: Bank | null;
     debtBank: Bank | null;
     state: PositionState;

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

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

package/dist/utils/marginfiUtils.js

@@ -246,13 +246,13 @@ function getBankLiquidityAvailableBaseUnit(bank, availableToDeposit) {
     }
     return BigInt(Math.floor(amountCanBeUsed));
 }
-async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
+async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment, priceType) {
     let amountUsed = 0;
     let amountCanBeUsed = BigInt(0);
     let marketPrice = 0;
     let originationFee = 0;
     if (bank !== null) {
-        [marketPrice] = await (0, priceUtils_1.fetchTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)]);
+        [marketPrice] = await (0, priceUtils_1.fetchTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)], priceType);
         const [assetShareValue, liabilityShareValue] = getUpToDateShareValues(bank);
         const shareValue = isAsset ? assetShareValue : liabilityShareValue;
         amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
@@ -289,7 +289,7 @@ async function getBank(umi, data, marginfiGroup) {
             ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)((0, constants_1.getMarginfiAccounts)(undefined, marginfiGroup).bankAccounts[marginfiGroup?.toString() ?? ""][data?.mint.toString()].bank), { commitment: "confirmed" })
             : null;
 }
-async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup, supply, debt, programEnv, contextUpdates) {
+async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup, supply, debt, programEnv, contextUpdates, priceType) {
     let marginfiAccount = lpUserAccount.data ??
         (lpUserAccount.pk
             ? await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(lpUserAccount.pk), {
@@ -326,7 +326,7 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
             if (!supply.mint) {
                 supply.mint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint);
             }
-            supplyUsage = await getTokenUsage(supplyBank, true, (0, numberUtils_1.bytesToI80F48)(supplyBalances[0].assetShares.value), contextUpdates?.supplyAdjustment);
+            supplyUsage = await getTokenUsage(supplyBank, true, (0, numberUtils_1.bytesToI80F48)(supplyBalances[0].assetShares.value), contextUpdates?.supplyAdjustment, priceType);
         }
         if (debtBalances.length > 0) {
             if (debtBank === null) {
@@ -337,7 +337,7 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
             if (!debt.mint) {
                 debt.mint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(debtBank.mint);
             }
-            debtUsage = await getTokenUsage(debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), contextUpdates?.debtAdjustment);
+            debtUsage = await getTokenUsage(debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), contextUpdates?.debtAdjustment, priceType);
         }
     }
     if (supplyBank === null) {

package/dist/utils/priceUtils.d.ts

@@ -1,8 +1,14 @@
 import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
-export declare function fetchTokenPrices(mints: PublicKey[]): Promise<number[]>;
-export declare function getPythPrices(mints: PublicKey[]): Promise<number[]>;
-export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<number[]>;
-export declare function getJupTokenPrices(mints: PublicKey[]): Promise<number[]>;
-export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | string | undefined): number | undefined;
+import { PriceType } from "../generated";
+interface PriceResult {
+    realtimePrice: number;
+    emaPrice?: number;
+}
+export declare function fetchTokenPrices(mints: PublicKey[], priceType?: PriceType): Promise<number[]>;
+export declare function getPythPrices(mints: PublicKey[], priceType: PriceType): Promise<PriceResult[]>;
+export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<PriceResult[]>;
+export declare function getJupTokenPrices(mints: PublicKey[]): Promise<PriceResult[]>;
+export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | string | undefined, priceType?: PriceType): number | undefined;
+export {};
 //# sourceMappingURL=priceUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBrE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAyC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAsDnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAYzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,GAClD,MAAM,GAAG,SAAS,CAKpB"}
+{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAerE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,GACxC,OAAO,CAAC,MAAM,EAAE,CAAC,CAoDnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC,CA+CxB;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,WAAW,EAAE,CAAC,CA0DxB;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,WAAW,EAAE,CAAC,CAgBxB;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,GACxC,MAAM,GAAG,SAAS,CAQpB"}

package/dist/utils/priceUtils.js

@@ -34,38 +34,59 @@ const constants_1 = require("../constants");
 const numberUtils_1 = require("./numberUtils");
 const generalUtils_1 = require("./generalUtils");
 const jupiterUtils_1 = require("./jupiterUtils");
-async function fetchTokenPrices(mints) {
+const generated_1 = require("../generated");
+async function fetchTokenPrices(mints, priceType = generated_1.PriceType.Realtime) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
     if (!mints.some((mint) => !(mint.toString() in constants_1.PRICES) ||
         currentTime - constants_1.PRICES[mint.toString()].time > 3)) {
-        return mints.map((mint) => constants_1.PRICES[mint.toString()].price);
+        return mints.map((mint) => {
+            const priceData = constants_1.PRICES[mint.toString()];
+            return priceType === generated_1.PriceType.Ema
+                ? priceData.emaPrice
+                : priceData.realtimePrice;
+        });
     }
     const pythMints = mints.filter((x) => x.toString() in constants_1.PYTH_PRICE_FEED_IDS);
     const switchboardMints = mints.filter((x) => x.toString() in Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS));
     const otherMints = mints.filter((x) => !pythMints.includes(x) && !switchboardMints.includes(x));
     const [pythData, switchboardData, jupData] = await Promise.all([
-        (0, generalUtils_1.zip)(pythMints, await getPythPrices(pythMints)),
+        (0, generalUtils_1.zip)(pythMints, await getPythPrices(pythMints, priceType)),
         (0, generalUtils_1.zip)(switchboardMints, await getSwitchboardPrices(switchboardMints)),
         (0, generalUtils_1.zip)(otherMints, await getJupTokenPrices(otherMints)),
     ]);
     const prices = mints.map((mint) => {
         const item = [...pythData, ...switchboardData, ...jupData].find((data) => data[0].equals(mint));
-        return item ? item[1] : 0;
+        return item ? item[1] : { realtimePrice: 0 };
     });
     for (var i = 0; i < mints.length; i++) {
+        const realtimePrice = prices[i].realtimePrice;
         constants_1.PRICES[mints[i].toString()] = {
-            price: Number(prices[i]),
+            realtimePrice,
+            emaPrice: prices[i].emaPrice ?? realtimePrice,
             time: (0, generalUtils_1.currentUnixSeconds)(),
         };
     }
-    return prices;
+    return prices.map((x) => priceType === generated_1.PriceType.Ema
+        ? (x.emaPrice ?? x.realtimePrice)
+        : x.realtimePrice);
 }
-async function getPythPrices(mints) {
+async function getPythPrices(mints, priceType) {
     if (mints.length === 0) {
         return [];
     }
     const priceFeedIds = mints.map((mint) => constants_1.PYTH_PRICE_FEED_IDS[mint.toString()]);
     const getReq = async () => await fetch(`https://hermes.pyth.network/v2/updates/price/latest?${priceFeedIds.map((x) => `ids%5B%5D=${x}`).join("&")}`);
+    const derivePrice = (price, exponent) => {
+        if (exponent > 0) {
+            return Number((0, numberUtils_1.toBaseUnit)(Number(price), exponent));
+        }
+        else if (exponent < 0) {
+            return (0, numberUtils_1.fromBaseUnit)(BigInt(price), Math.abs(exponent));
+        }
+        else {
+            return Number(price);
+        }
+    };
     const prices = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         let resp = await getReq();
         let status = resp.status;
@@ -74,15 +95,10 @@ async function getPythPrices(mints) {
         }
         const json = await resp.json();
         const prices = json.parsed.map((x) => {
-            if (x.price.expo > 0) {
-                return Number((0, numberUtils_1.toBaseUnit)(Number(x.price.price), x.price.expo));
-            }
-            else if (x.price.expo < 0) {
-                return (0, numberUtils_1.fromBaseUnit)(BigInt(x.price.price), Math.abs(x.price.expo));
-            }
-            else {
-                return Number(x.price.price);
-            }
+            return {
+                realtimePrice: derivePrice(x.price.price, x.price.expo),
+                emaPrice: derivePrice(x.ema_price.price, x.ema_price.expo),
+            };
         });
         return prices;
     }, 5, 200);
@@ -129,23 +145,31 @@ async function getSwitchboardPrices(mints) {
     }
     const missingMints = mints.filter((x) => !prices[x.toString()]);
     const jupPrices = (0, generalUtils_1.zip)(missingMints, await getJupTokenPrices(missingMints.map((x) => new web3_js_1.PublicKey(x)))).reduce((acc, [key, value]) => {
-        acc[key.toString()] = value;
+        acc[key.toString()] = value.realtimePrice;
         return acc;
     }, {});
-    return Object.values(getSortedPriceData({ ...prices, ...jupPrices }, mints));
+    return Object.values(getSortedPriceData({ ...prices, ...jupPrices }, mints)).map((x) => {
+        return { realtimePrice: x };
+    });
 }
 async function getJupTokenPrices(mints) {
     if (mints.length == 0) {
         return [];
     }
     const data = getSortedPriceData(await (0, jupiterUtils_1.getJupPriceData)(mints), mints);
-    return Object.values(data).map((x) => x !== null && typeof x === "object" && "price" in x
+    const prices = Object.values(data).map((x) => x !== null && typeof x === "object" && "price" in x
         ? parseFloat(x.price)
         : 0);
+    return prices.map((x) => {
+        return { realtimePrice: x };
+    });
 }
-function safeGetPrice(mint) {
+function safeGetPrice(mint, priceType = generated_1.PriceType.Realtime) {
     if (mint && mint?.toString() in constants_1.PRICES) {
-        return constants_1.PRICES[mint.toString()].price;
+        const priceData = constants_1.PRICES[mint.toString()];
+        return priceType === generated_1.PriceType.Ema
+            ? priceData.emaPrice
+            : priceData.realtimePrice;
     }
     return undefined;
 }

package/local/logPositions.ts

@@ -7,6 +7,7 @@ import {
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LOCAL_IRONFORGE_API_URL,
+  PriceType,
   safeGetPrice,
   SOLAUTO_PROD_PROGRAM,
 } from "../src";
@@ -96,7 +97,7 @@ async function main(filterWhitelist: boolean) {
       umi,
       positions.map((x) => new PublicKey(x.publicKey!))
     )
-  ).sort((a, b) => a.netWorthUsd() - b.netWorthUsd());
+  ).sort((a, b) => a.netWorthUsd - b.netWorthUsd);
 
   const tokensUsed = Array.from(
     new Set(
@@ -114,17 +115,17 @@ async function main(filterWhitelist: boolean) {
   let awaitingBoostPositions = 0;
 
   for (const pos of positionsEx) {
-    await pos.updateWithLatestPrices(
-      safeGetPrice(pos.state().supply.mint),
-      safeGetPrice(pos.state().debt.mint)
-    );
+    await pos.updateWithLatestPrices({
+      supplyPrice: safeGetPrice(pos.supplyMint),
+      debtPrice: safeGetPrice(pos.debtMint),
+    });
 
     const actionToTake = pos.eligibleForRebalance(0);
 
-    const repayFrom = pos.settings()!.repayToBps + pos.settings()!.repayGap;
+    const repayFrom = pos.settings!.repayToBps + pos.settings!.repayGap;
     const unhealthy = actionToTake === "repay";
     const healthText = unhealthy
-      ? `(Unhealthy: ${pos.state().liqUtilizationRateBps - repayFrom}bps)`
+      ? `(Unhealthy: ${pos.state.liqUtilizationRateBps - repayFrom}bps)`
       : "";
     if (unhealthy) {
       unhealthyPositions += 1;
@@ -138,10 +139,10 @@ async function main(filterWhitelist: boolean) {
 
     console.log(
       pos.publicKey.toString(),
-      `(${pos.data().authority!.toString()} ${pos.data().positionId})`
+      `(${pos.authority.toString()} ${pos.positionId})`
     );
     console.log(
-      `${pos.strategyName()}: $${formatNumber(pos.netWorthUsd(), 2, 10000, 2)} ${healthText} ${boostText}`
+      `${pos.strategyName}: $${formatNumber(pos.netWorthUsd, 2, 10000, 2)} ${healthText} ${boostText}`
     );
   }
 
@@ -153,15 +154,14 @@ async function main(filterWhitelist: boolean) {
   );
   console.log(
     "Total users:",
-    Array.from(new Set(positionsEx.map((x) => x.data().authority!.toString())))
-      .length
+    Array.from(new Set(positionsEx.map((x) => x.authority.toString()))).length
   );
 
   const tvl = positionsEx
     .map((x) => x.supplyUsd())
     .reduce((acc, curr) => acc + curr, 0);
   const netWorth = positionsEx
-    .map((x) => x.netWorthUsd())
+    .map((x) => x.netWorthUsd)
     .reduce((acc, curr) => acc + curr, 0);
 
   console.log(`TVL: $${formatNumber(tvl, 2, 10000, 2)}`);