@haven-fi/solauto-sdk 1.0.694 → 1.0.696

package/dist/constants/solautoConstants.d.ts

@@ -6,15 +6,19 @@ export declare const MIN_BOOST_GAP_BPS = 50;
 export declare const MIN_USD_SUPPORTED_POSITION = 1000;
 export declare const OFFSET_FROM_MAX_LTV = 0.005;
 export declare const REFERRER_PERCENTAGE = 0.15;
+interface PriceCache {
+    realtimePrice: number;
+    confInterval: number;
+    emaPrice: number;
+    emaConfInterval: number;
+    time: number;
+}
 export declare const PRICES: {
-    [key: string]: {
-        realtimePrice: number;
-        emaPrice: number;
-        time: number;
-    };
+    [key: string]: PriceCache;
 };
 export declare const CHORES_TX_NAME = "account chores";
 export declare const JITO_TIP_ACCOUNTS: string[];
 export declare const SOLAUTO_LUT = "8b7KefQDroVLGao71J5H3hFwABeyMCgCrLpXWssNFhk9";
 export declare const STANDARD_LUT_ACCOUNTS: string[];
+export {};
 //# sourceMappingURL=solautoConstants.d.ts.map

package/dist/constants/solautoConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAEvG,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAE/C,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,UAAU,UAAU;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACd;AACD,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAAO,CAAC;AAExD,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAE/C,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC"}

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

@@ -17,9 +17,9 @@ export declare class RebalanceSwapManager {
     constructor(client: SolautoClient, values: RebalanceValues, flRequirements?: FlashLoanRequirements | undefined, targetLiqUtilizationRateBps?: number | undefined, priceType?: PriceType | undefined);
     private isBoost;
     private usdToSwap;
+    private swapDetails;
     private postRebalanceLiqUtilizationRateBps;
     private findSufficientQuote;
-    private swapDetails;
     private bigIntWithIncrement;
     setSwapParams(attemptNum: number): Promise<void>;
     getSwapTxData(): Promise<{

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

@@ -1 +1 @@
-{"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAU3E,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAXb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;gBAG9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAK/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kCAAkC;YA2B5B,mBAAmB;IAoCjC,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IA4EhC,aAAa;;;;;;CAWpB"}
+{"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAS3E,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAXb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;gBAG9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAK/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IA2BnB,OAAO,CAAC,kCAAkC;YA4B5B,mBAAmB;IAoCjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}

package/dist/services/rebalance/rebalanceSwapManager.js

@@ -20,16 +20,33 @@ class RebalanceSwapManager {
     usdToSwap() {
         return Math.abs(this.values.debtAdjustmentUsd);
     }
+    swapDetails() {
+        const input = this.isBoost()
+            ? this.client.pos.state.debt
+            : this.client.pos.state.supply;
+        const output = this.isBoost()
+            ? this.client.pos.state.supply
+            : this.client.pos.state.debt;
+        const supplyPrice = this.client.pos.supplyPrice(this.priceType);
+        const debtPrice = this.client.pos.debtPrice(this.priceType);
+        const inputPrice = this.isBoost() ? debtPrice : supplyPrice;
+        const outputPrice = this.isBoost() ? supplyPrice : debtPrice;
+        let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / inputPrice, input.decimals);
+        return {
+            inputAmount,
+            input,
+            inputPrice,
+            output,
+            outputPrice,
+        };
+    }
     postRebalanceLiqUtilizationRateBps(swapOutputAmount) {
         let supplyUsd = this.client.pos.supplyUsd(this.priceType);
-        // TODO: add token balance change
         let debtUsd = this.client.pos.debtUsd(this.priceType);
-        const outputToken = this.isBoost()
-            ? this.client.pos.supplyMint
-            : this.client.pos.debtMint;
+        // TODO: add token balance change
+        const { output, outputPrice } = this.swapDetails();
         const swapOutputUsd = swapOutputAmount
-            ? (0, utils_1.fromBaseUnit)(swapOutputAmount, (0, utils_1.tokenInfo)(outputToken).decimals) *
-                ((0, utils_1.safeGetPrice)(outputToken, this.priceType) ?? 0)
+            ? (0, utils_1.fromBaseUnit)(swapOutputAmount, (0, utils_1.tokenInfo)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint)).decimals) * outputPrice
             : this.usdToSwap();
         supplyUsd = this.isBoost()
             ? supplyUsd + swapOutputUsd
@@ -62,32 +79,18 @@ class RebalanceSwapManager {
         }
         return swapQuote;
     }
-    swapDetails() {
-        const input = this.isBoost()
-            ? this.client.pos.state.debt
-            : this.client.pos.state.supply;
-        const output = this.isBoost()
-            ? this.client.pos.state.supply
-            : this.client.pos.state.debt;
-        let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(input.mint, this.priceType), input.decimals);
-        return {
-            input,
-            output,
-            inputAmount,
-        };
-    }
     bigIntWithIncrement(num, inc) {
         return num + BigInt(Math.round(Number(num) * inc));
     }
     async setSwapParams(attemptNum) {
         const rebalanceToZero = this.targetLiqUtilizationRateBps === 0;
-        let { input, output, inputAmount } = this.swapDetails();
+        let { input, output, outputPrice, inputAmount } = this.swapDetails();
         let outputAmount = rebalanceToZero
             ? output.amountUsed.baseUnit +
                 BigInt(Math.round(Number(output.amountUsed.baseUnit) *
                     // Add this small percentage to account for the APR on the debt between now and the transaction
                     0.0001))
-            : (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(output.mint, this.priceType), output.decimals);
+            : (0, utils_1.toBaseUnit)(this.usdToSwap() / outputPrice, output.decimals);
         const flashLoanRepayFromDebt = !this.isBoost() &&
             this.flRequirements &&
             this.flRequirements.liquiditySource === generated_1.TokenType.Debt;

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

@@ -1 +1 @@
-{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAgCrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IATvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,YAAY,CAAC,EAAE,OAAO,YAAA;IAGhC,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IAwC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAyBnB,sBAAsB;YAyBtB,mBAAmB;IA8EpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}
+{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AA8BrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IATvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,YAAY,CAAC,EAAE,OAAO,YAAA;IAGhC,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IAwC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAyBnB,sBAAsB;YAyBtB,mBAAmB;IAwEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -199,13 +199,7 @@ class RebalanceTxBuilder {
             priceType: this.priceType,
         };
         (0, utils_1.consoleLog)("Rebalance details:", rebalanceDetails);
-        (0, utils_1.consoleLog)("Prices:", (0, utils_1.safeGetPrice)(this.client.pos.supplyMint, this.priceType), (0, utils_1.safeGetPrice)(this.client.pos.debtMint, this.priceType));
-        // TODO: remove me
-        if ((0, utils_1.isMarginfiPosition)(this.client.pos)) {
-            const weightedAssets = this.values.endResult.supplyUsd * (0, utils_1.bytesToI80F48)(this.client.pos.supplyBank.config.assetWeightInit.value);
-            const weightedLiabs = this.values.endResult.debtUsd * (0, utils_1.bytesToI80F48)(this.client.pos.debtBank.config.liabilityWeightInit.value);
-            (0, utils_1.consoleLog)("Weighted assets & liabs:", weightedAssets, weightedLiabs);
-        }
+        (0, utils_1.consoleLog)("Prices:", this.client.pos.supplyPrice(this.priceType), this.client.pos.debtPrice(this.priceType));
         const firstRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PreSwap, rebalanceDetails);
         const lastRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PostSwap, rebalanceDetails);
         if (!flashLoanDetails) {

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts

@@ -5,8 +5,10 @@ import { LendingPlatform, PriceType } from "../generated";
 export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
     lendingPlatform: LendingPlatform;
     maxLtvPriceType: PriceType;
-    supplyBank: Bank | null;
-    debtBank: Bank | null;
+    private supplyBank;
+    private debtBank;
+    supplyPrice(priceType?: PriceType): number | undefined;
+    debtPrice(priceType?: PriceType): number | undefined;
     private getBankAccounts;
     getBanks(): Promise<Bank[]>;
     priceOracles(): Promise<PublicKey[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAoB,MAAM,iBAAiB,CAAC;AAezD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAC3C,eAAe,YAAiB;IAEzB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAC/B,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAQ;IAEpC,OAAO,CAAC,eAAe;IAMjB,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAW3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,OAAO,CAAC,6BAA6B;IAwBrC,gCAAgC,CAAC,KAAK,EAAE,IAAI,EAAE;IAK9C,4BAA4B,CAAC,KAAK,EAAE,IAAI,EAAE;IAQ1C,IAAI,eAAe,cAElB;IAED,IAAI,aAAa,cAEhB;IAED,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}
+{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAA+B,MAAM,iBAAiB,CAAC;AAepE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAC3C,eAAe,YAAiB;IAEhC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAErC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAItD,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAIpD,OAAO,CAAC,eAAe;IAMjB,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAW3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,OAAO,CAAC,6BAA6B;IAwBrC,gCAAgC,CAAC,KAAK,EAAE,IAAI,EAAE;IAK9C,4BAA4B,CAAC,KAAK,EAAE,IAAI,EAAE;IAQ1C,IAAI,eAAe,cAElB;IAED,IAAI,aAAa,cAEhB;IAED,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -16,6 +16,12 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
         this.supplyBank = null;
         this.debtBank = null;
     }
+    supplyPrice(priceType) {
+        return this._supplyPrice ?? (0, utils_1.safeGetPrice)(this.supplyMint, priceType, marginfi_sdk_1.PriceBias.Low);
+    }
+    debtPrice(priceType) {
+        return this._debtPrice ?? (0, utils_1.safeGetPrice)(this.debtMint, priceType, marginfi_sdk_1.PriceBias.High);
+    }
     getBankAccounts(mint) {
         const group = this.lpPoolAccount.toString();
         const bankAccounts = (0, constants_1.getMarginfiAccounts)(this.lpEnv).bankAccounts;

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -39,8 +39,8 @@ export declare abstract class SolautoPositionEx {
     private _debtMint?;
     protected _data: SolautoPositionExData;
     private readonly firstState;
-    private _supplyPrice?;
-    private _debtPrice?;
+    protected _supplyPrice?: number;
+    protected _debtPrice?: number;
     rebalance: PositionRebalanceHelper;
     maxLtvPriceType: PriceType;
     constructor(args: PositionExArgs);
@@ -69,10 +69,10 @@ export declare abstract class SolautoPositionEx {
     netWorthUsd(priceType?: PriceType): number;
     get totalSupply(): number;
     supplyUsd(priceType?: PriceType): number;
-    protected supplyPrice(priceType?: PriceType): number | undefined;
+    supplyPrice(priceType?: PriceType): number | undefined;
     get totalDebt(): number;
     debtUsd(priceType?: PriceType): number;
-    protected debtPrice(priceType?: PriceType): number | undefined;
+    debtPrice(priceType?: PriceType): number | undefined;
     get supplyLiquidityDepositable(): number;
     get supplyLiquidityUsdDepositable(): number;
     get supplyLiquidityUsdAvailable(): number;

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

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

package/dist/solautoPosition/solautoPositionEx.js

@@ -182,7 +182,7 @@ class SolautoPositionEx {
         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 ?? this.supplyPrice()), this.supplyMintInfo.decimals);
     }
     updateLiqUtilizationRate(supplyUsd, debtUsd, priceType) {
         this._data.state.liqUtilizationRateBps = (0, utils_1.getLiqUtilzationRateBps)(supplyUsd ?? this.supplyUsd(priceType), debtUsd ?? this.debtUsd(priceType), this.state.liqThresholdBps);

package/dist/utils/priceUtils.d.ts

@@ -1,14 +1,17 @@
 import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
 import { PriceType } from "../generated";
+import { PriceBias } from "../marginfi-sdk";
 interface PriceResult {
     realtimePrice: number;
+    confInterval?: number;
     emaPrice?: number;
+    emaConfInterval?: number;
 }
-export declare function fetchTokenPrices(mints: PublicKey[], priceType?: PriceType): Promise<number[]>;
+export declare function fetchTokenPrices(mints: PublicKey[], priceType?: PriceType, priceBias?: PriceBias): Promise<number[]>;
 export declare function getPythPrices(mints: PublicKey[]): Promise<Record<string, PriceResult>>;
 export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<Record<string, PriceResult>>;
 export declare function getJupTokenPrices(mints: PublicKey[]): Promise<Record<string, PriceResult>>;
-export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | string | undefined, priceType?: PriceType): number | undefined;
+export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | string | undefined, priceType?: PriceType, priceBias?: PriceBias): 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;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,CAkDnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAkDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CA+CtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAiBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,GACxC,MAAM,GAAG,SAAS,CAQpB"}
+{"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;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CA0CnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAoDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CA+CtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAiBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,GAAG,SAAS,CAsBpB"}

package/dist/utils/priceUtils.js

@@ -35,7 +35,8 @@ const numberUtils_1 = require("./numberUtils");
 const generalUtils_1 = require("./generalUtils");
 const jupiterUtils_1 = require("./jupiterUtils");
 const generated_1 = require("../generated");
-async function fetchTokenPrices(mints, priceType = generated_1.PriceType.Realtime) {
+const marginfi_sdk_1 = require("../marginfi-sdk");
+async function fetchTokenPrices(mints, priceType = generated_1.PriceType.Realtime, priceBias) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
     const mintStrs = mints.map((x) => x.toString());
     const cachedPrices = Object.fromEntries(Object.entries(constants_1.PRICES).filter(([mint, price]) => mintStrs.includes(mint) && currentTime - price.time <= 3));
@@ -51,24 +52,17 @@ async function fetchTokenPrices(mints, priceType = generated_1.PriceType.Realtim
         getJupTokenPrices(otherMints),
     ])));
     for (const mint of newMints) {
-        const realtimePrice = newPrices[mint.toString()].realtimePrice;
+        const data = newPrices[mint.toString()];
+        const realtimePrice = data.realtimePrice;
         constants_1.PRICES[mint.toString()] = {
             realtimePrice,
-            emaPrice: newPrices[mint.toString()].emaPrice ?? realtimePrice,
+            confInterval: data.confInterval ?? 0,
+            emaPrice: data.emaPrice ?? realtimePrice,
+            emaConfInterval: data.emaConfInterval ?? 0,
             time: (0, generalUtils_1.currentUnixSeconds)(),
         };
     }
-    const prices = {
-        ...constants_1.PRICES,
-        ...newPrices,
-    };
-    return mints.map((x) => {
-        const priceResult = prices[x.toString()];
-        const realtimePrice = priceResult.realtimePrice;
-        return priceType === generated_1.PriceType.Ema
-            ? (priceResult.emaPrice ?? realtimePrice)
-            : realtimePrice;
-    });
+    return mints.map((x) => safeGetPrice(x, priceType, priceBias));
 }
 async function getPythPrices(mints) {
     if (mints.length === 0) {
@@ -76,7 +70,7 @@ async function getPythPrices(mints) {
     }
     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) => {
+    const deriveValue = (price, exponent) => {
         if (exponent > 0) {
             return Number((0, numberUtils_1.toBaseUnit)(Number(price), exponent));
         }
@@ -96,8 +90,10 @@ async function getPythPrices(mints) {
         const json = await resp.json();
         const prices = json.parsed.map((x) => {
             return {
-                realtimePrice: derivePrice(x.price.price, x.price.expo),
-                emaPrice: derivePrice(x.ema_price.price, x.ema_price.expo),
+                realtimePrice: deriveValue(x.price.price, x.price.expo),
+                confInterval: deriveValue(x.price.conf, x.price.expo),
+                emaPrice: deriveValue(x.ema_price.price, x.ema_price.expo),
+                emaConfInterval: deriveValue(x.ema_price.conf, x.ema_price.expo),
             };
         });
         return prices;
@@ -160,12 +156,23 @@ async function getJupTokenPrices(mints) {
     ]));
     return prices;
 }
-function safeGetPrice(mint, priceType = generated_1.PriceType.Realtime) {
+function safeGetPrice(mint, priceType = generated_1.PriceType.Realtime, priceBias) {
     if (mint && mint?.toString() in constants_1.PRICES) {
         const priceData = constants_1.PRICES[mint.toString()];
-        return priceType === generated_1.PriceType.Ema
+        let price = priceType === generated_1.PriceType.Ema
             ? priceData.emaPrice
             : priceData.realtimePrice;
+        if (priceBias !== undefined) {
+            const confInterval = priceType === generated_1.PriceType.Ema ? priceData.confInterval : priceData.emaConfInterval;
+            const conf = Math.min(confInterval * 1.96, price * 0.05);
+            if (priceBias === marginfi_sdk_1.PriceBias.Low) {
+                price = price - conf;
+            }
+            else {
+                price = price + conf;
+            }
+        }
+        return price;
     }
     return undefined;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAkC5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAoC5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}

package/dist/utils/switchboardUtils.js

@@ -68,7 +68,9 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
     const price = responses[0].value.toNumber();
     constants_1.PRICES[mint.toString()] = {
         realtimePrice: price,
+        confInterval: price, // TODO: do we need to change if marginfi fixes their stuff?
         emaPrice: price,
+        emaConfInterval: 0,
         time: (0, generalUtils_1.currentUnixSeconds)(),
     };
     return {

package/local/txSandbox.ts

@@ -1,22 +1,16 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
-  bytesToI80F48,
   ClientTransactionsManager,
   consoleLog,
-  fetchBank,
-  fetchMarginfiAccount,
   getBatches,
   getClient,
-  getLiqUtilzationRateBps,
-  getMaxLiqUtilizationRateBps,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
-  marginfiAccountEmpty,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -29,7 +23,7 @@ import {
 import { getSecretKey } from "./shared";
 
 const payForTransaction = false;
-const testProgram = false;
+const testProgram = true;
 const lpEnv: ProgramEnv = "Prod";
 
 let [, umi] = getSolanaRpcConnection(
@@ -53,8 +47,8 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 1,
-    authority: new PublicKey("R8Nnj1UqK1BRPnfJYj7MvfPUK3GmEzmgh1CwFFtUNsF"),
+    positionId: 2,
+    authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
@@ -66,7 +60,7 @@ export async function main() {
     txHandler: client,
     txRunType: payForTransaction ? "normal" : "only-simulate",
     priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 1 },
+    retryConfig: { totalRetries: 5 },
   });
   const statuses = await txManager.send(transactionItems);
   consoleLog(statuses);

package/package.json

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

package/src/constants/solautoConstants.ts

@@ -29,7 +29,14 @@ export const OFFSET_FROM_MAX_LTV = 0.005;
 
 export const REFERRER_PERCENTAGE = 0.15;
 
-export const PRICES: { [key: string]: { realtimePrice: number; emaPrice: number; time: number } } = {};
+interface PriceCache {
+  realtimePrice: number;
+  confInterval: number;
+  emaPrice: number;
+  emaConfInterval: number;
+  time: number;
+}
+export const PRICES: { [key: string]: PriceCache } = {};
 
 export const CHORES_TX_NAME = "account chores";
 
@@ -57,4 +64,4 @@ export const STANDARD_LUT_ACCOUNTS = [
   SYSVAR_RENT_PUBKEY,
   SYSVAR_INSTRUCTIONS_PUBKEY,
   JUPITER_PROGRAM_ID,
-].map((x) => x.toString());
+].map((x) => x.toString());

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -9,7 +9,6 @@ import {
   consoleLog,
   fromBaseUnit,
   getLiqUtilzationRateBps,
-  safeGetPrice,
   toBaseUnit,
   tokenInfo,
 } from "../../utils";
@@ -39,17 +38,45 @@ export class RebalanceSwapManager {
     return Math.abs(this.values.debtAdjustmentUsd);
   }
 
+  private swapDetails() {
+    const input = this.isBoost()
+      ? this.client.pos.state.debt
+      : this.client.pos.state.supply;
+    const output = this.isBoost()
+      ? this.client.pos.state.supply
+      : this.client.pos.state.debt;
+
+    const supplyPrice = this.client.pos.supplyPrice(this.priceType)!;
+    const debtPrice = this.client.pos.debtPrice(this.priceType)!;
+    const inputPrice = this.isBoost() ? debtPrice : supplyPrice;
+    const outputPrice = this.isBoost() ? supplyPrice : debtPrice;
+
+    let inputAmount = toBaseUnit(
+      this.usdToSwap() / inputPrice!,
+      input.decimals
+    );
+
+    return {
+      inputAmount,
+      input,
+      inputPrice,
+      output,
+      outputPrice,
+    };
+  }
+
   private postRebalanceLiqUtilizationRateBps(swapOutputAmount?: bigint) {
     let supplyUsd = this.client.pos.supplyUsd(this.priceType);
-    // TODO: add token balance change
     let debtUsd = this.client.pos.debtUsd(this.priceType);
+    // TODO: add token balance change
+
+    const { output, outputPrice } = this.swapDetails();
 
-    const outputToken = this.isBoost()
-      ? this.client.pos.supplyMint
-      : this.client.pos.debtMint;
     const swapOutputUsd = swapOutputAmount
-      ? fromBaseUnit(swapOutputAmount, tokenInfo(outputToken).decimals) *
-        (safeGetPrice(outputToken, this.priceType) ?? 0)
+      ? fromBaseUnit(
+          swapOutputAmount,
+          tokenInfo(toWeb3JsPublicKey(output.mint)).decimals
+        ) * outputPrice
       : this.usdToSwap();
 
     supplyUsd = this.isBoost()
@@ -102,33 +129,13 @@ export class RebalanceSwapManager {
     return swapQuote!;
   }
 
-  private swapDetails() {
-    const input = this.isBoost()
-      ? this.client.pos.state.debt
-      : this.client.pos.state.supply;
-    const output = this.isBoost()
-      ? this.client.pos.state.supply
-      : this.client.pos.state.debt;
-
-    let inputAmount = toBaseUnit(
-      this.usdToSwap() / safeGetPrice(input.mint, this.priceType)!,
-      input.decimals
-    );
-
-    return {
-      input,
-      output,
-      inputAmount,
-    };
-  }
-
   private bigIntWithIncrement(num: bigint, inc: number) {
     return num + BigInt(Math.round(Number(num) * inc));
   }
 
   async setSwapParams(attemptNum: number) {
     const rebalanceToZero = this.targetLiqUtilizationRateBps === 0;
-    let { input, output, inputAmount } = this.swapDetails();
+    let { input, output, outputPrice, inputAmount } = this.swapDetails();
 
     let outputAmount = rebalanceToZero
       ? output.amountUsed.baseUnit +
@@ -139,10 +146,7 @@ export class RebalanceSwapManager {
               0.0001
           )
         )
-      : toBaseUnit(
-          this.usdToSwap() / safeGetPrice(output.mint, this.priceType)!,
-          output.decimals
-        );
+      : toBaseUnit(this.usdToSwap() / outputPrice, output.decimals);
 
     const flashLoanRepayFromDebt =
       !this.isBoost() &&

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -8,7 +8,6 @@ import {
   TransactionItemInputs,
 } from "../../types";
 import {
-  bytesToI80F48,
   consoleLog,
   fromBaseUnit,
   fromBps,
@@ -16,7 +15,6 @@ import {
   getTokenAccount,
   hasFirstRebalance,
   hasLastRebalance,
-  isMarginfiPosition,
   safeGetPrice,
   tokenInfo,
 } from "../../utils";
@@ -344,15 +342,9 @@ export class RebalanceTxBuilder {
     consoleLog("Rebalance details:", rebalanceDetails);
     consoleLog(
       "Prices:",
-      safeGetPrice(this.client.pos.supplyMint, this.priceType),
-      safeGetPrice(this.client.pos.debtMint, this.priceType)
+      this.client.pos.supplyPrice(this.priceType),
+      this.client.pos.debtPrice(this.priceType)
     );
-    // TODO: remove me
-    if (isMarginfiPosition(this.client.pos)) {
-      const weightedAssets = this.values.endResult.supplyUsd * bytesToI80F48(this.client.pos.supplyBank!.config.assetWeightInit.value);
-      const weightedLiabs = this.values.endResult.debtUsd * bytesToI80F48(this.client.pos.debtBank!.config.liabilityWeightInit.value);
-      consoleLog("Weighted assets & liabs:", weightedAssets, weightedLiabs);
-    }
 
     const firstRebalance = this.client.rebalanceIx(
       RebalanceStep.PreSwap,

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { Bank, safeFetchAllBank } from "../marginfi-sdk";
+import { Bank, PriceBias, safeFetchAllBank } from "../marginfi-sdk";
 import { publicKey } from "@metaplex-foundation/umi";
 import {
   calcMarginfiMaxLtvAndLiqThresholdBps,
@@ -21,8 +21,16 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   lendingPlatform = LendingPlatform.Marginfi;
   maxLtvPriceType = PriceType.Ema;
 
-  public supplyBank: Bank | null = null;
-  public debtBank: Bank | null = null;
+  private supplyBank: Bank | null = null;
+  private debtBank: Bank | null = null;
+
+  supplyPrice(priceType?: PriceType): number | undefined {
+    return this._supplyPrice ?? safeGetPrice(this.supplyMint, priceType, PriceBias.Low);
+  }
+  
+  debtPrice(priceType?: PriceType): number | undefined {
+    return this._debtPrice ?? safeGetPrice(this.debtMint, priceType, PriceBias.High);
+  }
 
   private getBankAccounts(mint: PublicKey) {
     const group = this.lpPoolAccount.toString();

package/src/solautoPosition/solautoPositionEx.ts

@@ -87,8 +87,8 @@ export abstract class SolautoPositionEx {
 
   private readonly firstState!: PositionState;
 
-  private _supplyPrice?: number;
-  private _debtPrice?: number;
+  protected _supplyPrice?: number;
+  protected _debtPrice?: number;
 
   public rebalance!: PositionRebalanceHelper;
   public maxLtvPriceType!: PriceType;
@@ -236,7 +236,7 @@ export abstract class SolautoPositionEx {
       : calcSupplyUsd(this.state);
   }
 
-  protected supplyPrice(priceType?: PriceType) {
+  supplyPrice(priceType?: PriceType) {
     return this._supplyPrice ?? safeGetPrice(this.supplyMint, priceType);
   }
 
@@ -251,7 +251,7 @@ export abstract class SolautoPositionEx {
       : calcDebtUsd(this.state);
   }
 
-  protected debtPrice(priceType?: PriceType) {
+  debtPrice(priceType?: PriceType) {
     return this._debtPrice ?? safeGetPrice(this.debtMint, priceType);
   }
 
@@ -364,7 +364,7 @@ export abstract class SolautoPositionEx {
     this._data.state.netWorth.baseAmountUsdValue =
       toRoundedUsdValue(netWorthUsd);
     this._data.state.netWorth.baseUnit = toBaseUnit(
-      netWorthUsd / (supplyPrice ?? safeGetPrice(this.supplyMint) ?? 0),
+      netWorthUsd / (supplyPrice ?? this.supplyPrice()!),
       this.supplyMintInfo.decimals
     );
   }

package/src/utils/priceUtils.ts

@@ -15,15 +15,19 @@ import {
 } from "./generalUtils";
 import { getJupPriceData } from "./jupiterUtils";
 import { PriceType } from "../generated";
+import { PriceBias } from "../marginfi-sdk";
 
 interface PriceResult {
   realtimePrice: number;
+  confInterval?: number;
   emaPrice?: number;
+  emaConfInterval?: number;
 }
 
 export async function fetchTokenPrices(
   mints: PublicKey[],
-  priceType: PriceType = PriceType.Realtime
+  priceType: PriceType = PriceType.Realtime,
+  priceBias?: PriceBias
 ): Promise<number[]> {
   const currentTime = currentUnixSeconds();
   const mintStrs = mints.map((x) => x.toString());
@@ -54,26 +58,18 @@ export async function fetchTokenPrices(
   );
 
   for (const mint of newMints) {
-    const realtimePrice = newPrices[mint.toString()].realtimePrice;
+    const data = newPrices[mint.toString()];
+    const realtimePrice = data.realtimePrice;
     PRICES[mint.toString()] = {
       realtimePrice,
-      emaPrice: newPrices[mint.toString()].emaPrice ?? realtimePrice,
+      confInterval: data.confInterval ?? 0,
+      emaPrice: data.emaPrice ?? realtimePrice,
+      emaConfInterval: data.emaConfInterval ?? 0,
       time: currentUnixSeconds(),
     };
   }
 
-  const prices: Record<string, PriceResult> = {
-    ...PRICES,
-    ...newPrices,
-  };
-
-  return mints.map((x) => {
-    const priceResult = prices[x.toString()];
-    const realtimePrice = priceResult.realtimePrice;
-    return priceType === PriceType.Ema
-      ? (priceResult.emaPrice ?? realtimePrice)
-      : realtimePrice;
-  });
+  return mints.map((x) => safeGetPrice(x, priceType, priceBias)!);
 }
 
 export async function getPythPrices(
@@ -92,7 +88,7 @@ export async function getPythPrices(
       `https://hermes.pyth.network/v2/updates/price/latest?${priceFeedIds.map((x) => `ids%5B%5D=${x}`).join("&")}`
     );
 
-  const derivePrice = (price: number, exponent: number) => {
+  const deriveValue = (price: number, exponent: number) => {
     if (exponent > 0) {
       return Number(toBaseUnit(Number(price), exponent));
     } else if (exponent < 0) {
@@ -113,8 +109,10 @@ export async function getPythPrices(
       const json = await resp.json();
       const prices = json.parsed.map((x: any) => {
         return {
-          realtimePrice: derivePrice(x.price.price, x.price.expo),
-          emaPrice: derivePrice(x.ema_price.price, x.ema_price.expo),
+          realtimePrice: deriveValue(x.price.price, x.price.expo),
+          confInterval: deriveValue(x.price.conf, x.price.expo),
+          emaPrice: deriveValue(x.ema_price.price, x.ema_price.expo),
+          emaConfInterval: deriveValue(x.ema_price.conf, x.ema_price.expo),
         };
       });
 
@@ -220,13 +218,28 @@ export async function getJupTokenPrices(
 
 export function safeGetPrice(
   mint: PublicKey | UmiPublicKey | string | undefined,
-  priceType: PriceType = PriceType.Realtime
+  priceType: PriceType = PriceType.Realtime,
+  priceBias?: PriceBias
 ): number | undefined {
   if (mint && mint?.toString() in PRICES) {
     const priceData = PRICES[mint!.toString()];
-    return priceType === PriceType.Ema
-      ? priceData.emaPrice
-      : priceData.realtimePrice;
+    let price =
+      priceType === PriceType.Ema
+        ? priceData.emaPrice
+        : priceData.realtimePrice;
+
+    if (priceBias !== undefined) {
+      const confInterval = priceType === PriceType.Ema ? priceData.confInterval : priceData.emaConfInterval;
+      const conf = Math.min(confInterval * 1.96, price * 0.05);
+
+      if (priceBias === PriceBias.Low) {
+        price = price - conf;
+      } else {
+        price = price + conf;
+      }
+    }
+
+    return price;
   }
   return undefined;
 }

package/src/utils/switchboardUtils.ts

@@ -74,7 +74,9 @@ export async function buildSwbSubmitResponseTx(
   const price = (responses[0].value as Big).toNumber();
   PRICES[mint.toString()] = {
     realtimePrice: price,
+    confInterval: price, // TODO: do we need to change if marginfi fixes their stuff?
     emaPrice: price,
+    emaConfInterval: 0,
     time: currentUnixSeconds(),
   };