@haven-fi/solauto-sdk 1.0.836 → 1.0.837

package/dist/utils/marginfi/prices.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPythLstPriceData = getPythLstPriceData;
+exports.safeGetMarginfiBankPrice = safeGetMarginfiBankPrice;
+exports.getMarginfiBankPrice = getMarginfiBankPrice;
+const web3_js_1 = require("@solana/web3.js");
+const umi_1 = require("@metaplex-foundation/umi");
+const marginfi_1 = require("../../externalSdks/marginfi");
+const pyth_1 = require("../../externalSdks/pyth");
+const generated_1 = require("../../generated");
+const priceUtils_1 = require("../priceUtils");
+const numberUtils_1 = require("../numberUtils");
+const STAKE_POOL_PROGRAMS = new Set([
+    "SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy",
+    "SP12tWFxD9oJsVWNavTTBZvMbA6gkAmxtVgxdqvyvhY",
+    "SPMBzsVUuoHA4Jm6KunbsotaahvVikZs1JyTW6iJvbn",
+]);
+const PYTH_RECEIVER = "rec2HHDDnjLfj4kE7VyEtFA1HPGQLK33259532cRyHp";
+// Bank prices include protocol-specific multipliers and must not be overwritten
+// by the generic mint/USD market-price cache.
+const bankPrices = new Map();
+function bankPriceKey(bank) {
+    return [
+        bank.publicKey,
+        bank.config.oracleSetup,
+        ...bank.config.oracleKeys,
+        ...bank.config.padding.slice(6, 22),
+    ].join(":");
+}
+function getPythLstPriceData(bank, oracle, stakePool, clock) {
+    const pool = Buffer.from(stakePool.data);
+    if (stakePool.publicKey !== bank.config.oracleKeys[1] ||
+        !STAKE_POOL_PROGRAMS.has(stakePool.owner) ||
+        pool.length < 282 ||
+        pool[0] !== 1 ||
+        new web3_js_1.PublicKey(pool.subarray(162, 194)).toString() !== bank.mint) {
+        throw new Error(`Invalid PythLST stake pool for bank ${bank.publicKey}`);
+    }
+    const clockData = Buffer.from(clock.data);
+    if (clock.publicKey !== web3_js_1.SYSVAR_CLOCK_PUBKEY.toString() ||
+        clockData.length < 40) {
+        throw new Error("Invalid clock account");
+    }
+    const epoch = clockData.readBigUInt64LE(16);
+    const now = clockData.readBigInt64LE(32);
+    const supply = pool.readBigUInt64LE(266);
+    if (supply === 0n || epoch > pool.readBigUInt64LE(274) + 1n) {
+        throw new Error("PythLST stake pool has zero supply or is stale");
+    }
+    const rate = (pool.readBigUInt64LE(258) << 48n) / supply;
+    if (rate <= 0n || rate >= 3n << 48n) {
+        throw new Error("Invalid PythLST exchange rate");
+    }
+    const data = Buffer.from(oracle.data);
+    if (oracle.publicKey !== bank.config.oracleKeys[0] ||
+        oracle.owner !== PYTH_RECEIVER ||
+        data.length < 133 ||
+        data.subarray(0, 8).toString("hex") !== "22f123639d7ef4cd" ||
+        data[40] !== 1 // VerificationLevel::Full
+    ) {
+        throw new Error("Invalid PythLST base oracle");
+    }
+    const [price] = (0, pyth_1.getPriceMessageSerializer)().deserialize(data, 41);
+    if (now > price.publishTime + BigInt(bank.config.oracleMaxAge)) {
+        throw new Error("PythLST base oracle is stale");
+    }
+    if (price.price <= 0n || price.emaPrice <= 0n) {
+        throw new Error("Invalid PythLST base price");
+    }
+    // Match Marginfi's I80F48 multiplier and integer rounding before applying expo.
+    const scaled = (value) => Number((value * rate) >> 48n) * 10 ** price.exponent;
+    return {
+        realtimePrice: scaled(price.price),
+        emaPrice: scaled(price.emaPrice),
+        confInterval: scaled(price.conf) * 2.12,
+        emaConfInterval: scaled(price.emaConf) * 2.12,
+    };
+}
+function selectPrice(data, type = generated_1.PriceType.Realtime, bias) {
+    const price = type === generated_1.PriceType.Ema ? data.emaPrice : data.realtimePrice;
+    const conf = Math.min(type === generated_1.PriceType.Ema ? data.emaConfInterval : data.confInterval, price * 0.05);
+    return bias === undefined
+        ? price
+        : price + (bias === marginfi_1.PriceBias.Low ? -conf : conf);
+}
+function safeGetMarginfiBankPrice(bank, type, bias) {
+    const data = bank ? bankPrices.get(bankPriceKey(bank)) : undefined;
+    return data ? selectPrice(data, type, bias) : undefined;
+}
+async function getMarginfiBankPrice(umi, bank, type, bias) {
+    let data;
+    if (bank.config.oracleSetup === marginfi_1.OracleSetup.PythLST) {
+        const accounts = await umi.rpc.getAccounts([
+            bank.config.oracleKeys[0],
+            bank.config.oracleKeys[1],
+            (0, umi_1.publicKey)(web3_js_1.SYSVAR_CLOCK_PUBKEY),
+        ], { commitment: "confirmed" });
+        for (const account of accounts)
+            (0, umi_1.assertAccountExists)(account);
+        data = getPythLstPriceData(bank, accounts[0], accounts[1], accounts[2]);
+    }
+    else if (bank.config.oracleSetup === marginfi_1.OracleSetup.Fixed) {
+        // BankConfig.fixed_price occupies bytes 808..824 of the bank, formerly padding.
+        const price = (0, numberUtils_1.bytesToI80F48)(bank.config.padding.slice(6, 22));
+        if (!Number.isFinite(price) || price <= 0)
+            throw new Error("Invalid fixed bank price");
+        data = {
+            realtimePrice: price,
+            emaPrice: price,
+            confInterval: 0,
+            emaConfInterval: 0,
+        };
+    }
+    else {
+        return (await (0, priceUtils_1.fetchTokenPrices)([new web3_js_1.PublicKey(bank.mint)], type, bias))[0];
+    }
+    bankPrices.set(bankPriceKey(bank), data);
+    return selectPrice(data, type, bias);
+}

package/dist/utils/switchboardUtils.d.ts

@@ -4,16 +4,18 @@ import * as OnDemand from "@switchboard-xyz/on-demand";
 import { TransactionItemInputs } from "../types";
 import { CrossbarClient } from "@switchboard-xyz/common";
 import { SolautoClient, TransactionItem } from "../services";
-export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): Promise<{
+import { Bank } from "../externalSdks/marginfi";
+export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey, feedId?: string): Promise<{
     crossbar: CrossbarClient;
     feed: OnDemand.PullFeed;
 }>;
-export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey): Promise<TransactionItemInputs | undefined>;
-export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKey[]): Promise<{
+export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey, feedId?: string): Promise<TransactionItemInputs | undefined>;
+export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKey[], feedIds?: Record<string, string>): Promise<{
     mint: PublicKey;
     price: number;
     stale: boolean;
 }[]>;
 export declare function isSwitchboardMint(mint: PublicKey | string): boolean;
+export declare function getMarginfiSwitchboardFeeds(banks: Bank[]): Record<string, string>;
 export declare function addSwbOraclePullTxs(client: SolautoClient, txs: TransactionItem[]): Promise<void>;
 //# sourceMappingURL=switchboardUtils.d.ts.map

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;AAQvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAgCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAyE5C;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;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,eAAe,EAAE,iBAkCvB"}
+{"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,EAAa,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGjF,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAQvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,IAAI,EAA6B,MAAM,0BAA0B,CAAC;AAG3E,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,EAClB,MAAM,CAAC,EAAE,MAAM;;;GAiChB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA0E5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,EAClB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACnC,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAyB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,IAAI,EAAE,GACZ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxB;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,eAAe,EAAE,iBAmDvB"}

package/dist/utils/switchboardUtils.js

@@ -37,6 +37,7 @@ exports.getPullFeed = getPullFeed;
 exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
 exports.getSwitchboardFeedData = getSwitchboardFeedData;
 exports.isSwitchboardMint = isSwitchboardMint;
+exports.getMarginfiSwitchboardFeeds = getMarginfiSwitchboardFeeds;
 exports.addSwbOraclePullTxs = addSwbOraclePullTxs;
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
@@ -48,7 +49,13 @@ const generalUtils_1 = require("./generalUtils");
 const solanaUtils_1 = require("./solanaUtils");
 const common_1 = require("@switchboard-xyz/common");
 const services_1 = require("../services");
-async function getPullFeed(conn, mint, wallet) {
+const marginfi_1 = require("../externalSdks/marginfi");
+const generated_1 = require("../generated");
+async function getPullFeed(conn, mint, wallet, feedId) {
+    const address = feedId ?? constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()]?.feedId;
+    if (!address) {
+        throw new Error(`No Switchboard feed configured for ${mint}`);
+    }
     const dummyWallet = {
         publicKey: wallet ?? new web3_js_1.PublicKey("11111111111111111111111111111111"),
         signTransaction: async (tx) => tx,
@@ -60,14 +67,14 @@ async function getPullFeed(conn, mint, wallet) {
     const sbProgram = await anchor_1.Program.at(ON_DEMAND_MAINNET_PID, provider);
     const crossbar = new common_1.CrossbarClient(constants_1.CROSSBAR_URL);
     (0, generalUtils_1.consoleLog)("Pulled SWB program!");
-    (0, generalUtils_1.consoleLog)("Feed id:", constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId);
+    (0, generalUtils_1.consoleLog)("Feed id:", address);
     return {
         crossbar,
-        feed: new PullFeed(sbProgram, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)),
+        feed: new PullFeed(sbProgram, new web3_js_1.PublicKey(address)),
     };
 }
-async function buildSwbSubmitResponseTx(conn, signer, mint) {
-    const { feed, crossbar } = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
+async function buildSwbSubmitResponseTx(conn, signer, mint, feedId) {
+    const { feed, crossbar } = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey), feedId);
     (0, generalUtils_1.consoleLog)("Fetching crank IX...");
     const [pullIxs, responses, , luts] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await feed.fetchUpdateIx({
@@ -118,13 +125,13 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
         orderPrio: -2,
     };
 }
-async function getSwitchboardFeedData(conn, mints) {
+async function getSwitchboardFeedData(conn, mints, feedIds = {}) {
     if (mints.length === 0) {
         return [];
     }
     const currSlot = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await conn.getSlot("confirmed"), 5);
     const results = await Promise.all(mints.map(async (mint) => {
-        const { feed } = await getPullFeed(conn, mint);
+        const { feed } = await getPullFeed(conn, mint, undefined, feedIds[mint.toString()]);
         const result = await feed.loadData();
         const price = Number(result.result.value) / Math.pow(10, 18);
         const stale = currSlot > result.result.slot.toNumber() + result.maxStaleness;
@@ -135,19 +142,35 @@ async function getSwitchboardFeedData(conn, mints) {
 function isSwitchboardMint(mint) {
     return Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
 }
+function getMarginfiSwitchboardFeeds(banks) {
+    return Object.fromEntries(banks
+        .filter((bank) => bank.config.oracleSetup === marginfi_1.OracleSetup.SwitchboardPull)
+        .map((bank) => [
+        bank.mint.toString(), bank.config.oracleKeys[0].toString(),
+    ]));
+}
 async function addSwbOraclePullTxs(client, txs) {
+    if (!txs.some((tx) => tx.oracleInteractor)) {
+        return;
+    }
+    const feedIds = client.lendingPlatform === generated_1.LendingPlatform.Marginfi
+        ? getMarginfiSwitchboardFeeds(await (0, marginfi_1.fetchAllBank)(client.umi, [
+            (0, umi_1.publicKey)(client.pos.lpSupplyAccount),
+            (0, umi_1.publicKey)(client.pos.lpDebtAccount),
+        ]))
+        : Object.fromEntries(Object.entries(constants_1.SWITCHBOARD_PRICE_FEED_IDS).map(([mint, feed]) => [mint, feed.feedId]));
     const switchboardMints = [
-        ...(isSwitchboardMint(client.pos.supplyMint)
+        ...(feedIds[client.pos.supplyMint.toString()]
             ? [client.pos.supplyMint]
             : []),
-        ...(isSwitchboardMint(client.pos.debtMint) ? [client.pos.debtMint] : []),
+        ...(feedIds[client.pos.debtMint.toString()] ? [client.pos.debtMint] : []),
     ];
-    if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
+    if (switchboardMints.length) {
         (0, generalUtils_1.consoleLog)("Checking if oracle update(s) needed...");
-        const staleOracles = (await getSwitchboardFeedData(client.connection, switchboardMints)).filter((x) => x.stale).length > 0;
+        const staleOracles = (await getSwitchboardFeedData(client.connection, switchboardMints, feedIds)).filter((x) => x.stale).length > 0;
         if (staleOracles) {
             (0, generalUtils_1.consoleLog)("Requires oracle update(s)...");
-            const oracleTxs = switchboardMints.map((x) => new services_1.TransactionItem(async () => await buildSwbSubmitResponseTx(client.connection, client.signer, x), constants_1.UPDATE_ORACLE_TX_NAME));
+            const oracleTxs = switchboardMints.map((x) => new services_1.TransactionItem(async () => await buildSwbSubmitResponseTx(client.connection, client.signer, x, feedIds[x.toString()]), constants_1.UPDATE_ORACLE_TX_NAME));
             (0, generalUtils_1.consoleLog)("Set crank IXs in TX");
             txs.unshift(...oracleTxs);
         }

package/local/txSandbox.ts

@@ -120,15 +120,15 @@ async function refreshAll() {
 }
 
 // Crank a Switchboard pull feed for a single mint, as one standalone tx (no bundle).
-// Usage: npx ts-node local/txSandbox.ts [mint]
-//   mint defaults to SOL; accepts a raw mint address or a shorthand below.
+// Usage: pnpm sandbox [mint]
+//   mint defaults to JitoSOL; accepts a raw mint address or a shorthand below.
 const MINT_SHORTHANDS: Record<string, string> = {
   sol: NATIVE_MINT.toString(),
   jitosol: JITO_SOL,
 };
 
 function resolveMint(arg?: string): PublicKey {
-  if (!arg) return NATIVE_MINT;
+  if (!arg) return new PublicKey(JITO_SOL);
   const shorthand = MINT_SHORTHANDS[arg.toLowerCase()];
   return new PublicKey(shorthand ?? arg);
 }

package/package.json

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

package/src/constants/switchboardConstants.ts

@@ -1,4 +1,3 @@
-import { NATIVE_MINT } from "@solana/spl-token";
 import * as tokens from "./tokenConstants";
 
 interface SwitchboardFeed {
@@ -7,33 +6,9 @@ interface SwitchboardFeed {
 }
 
 // https://beta.ondemand.switchboard.xyz/solana/mainnet
+// SOL, JitoSOL, JTO, LST, hSOL and JupSOL banks have migrated to Pyth.
+// Marginfi refreshes must still select the feed from the bank's live configuration.
 export const SWITCHBOARD_PRICE_FEED_IDS: { [key: string]: SwitchboardFeed } = {
-  [NATIVE_MINT.toString()]: {
-    feedId: "4Hmd6PdjVA9auCoScE12iaBogfwS4ZXQ6VZoBeqanwWW",
-    feedHash: "0x19089ab8a78c2d6e1b0b17ed50db7d99d7a05260160dfdf727746f656e879539",
-  },
-  [tokens.JUP_SOL]: {
-    feedId: "BRCWKZ1PevwTFzBL2MLZM5hMwCNMWE8NYuS6zFPaXZ6y",
-    feedHash:
-      "0xd126e3a968e310748ad925d7d728f3e779121b0c26b7d1a3d061cc2da3093005",
-  },
-  [tokens.JITO_SOL]: {
-    feedId: "5htZ4vPKPjAEg8EJv6JHcaCetMM4XehZo8znQvrp6Ur3",
-    feedHash: "0x44f5a7676baf4c6e5eb26fdde2695e7e3e0971071b76ddc622fa71528092ca25"
-  },
-  [tokens.LST]: {
-    feedId: "BWK8Wnybb7rPteNMqJs9uWoqdfYApNym6WgE59BwLe1v",
-    feedHash: "0x74e140c452fe29cced80898a51961ed1410c1fe0efbdc970fe5aac986427419e"
-  },
-  [tokens.JTO]: {
-    feedId: "V9o7SWeCFpGpKbWwVQD9x5RnpUEMh8sUAwqi1XnCReu",
-    feedHash: "0x1ac1e88ed90c78e2514aa346ba1c90807d12524089920348f29b725832f4e070"
-  },
-  [tokens.H_SOL]: {
-    feedId: "3zCUYzDhuyZREWgngzJfUt2UzQ5SzKCUK5AdwiB2HYmU",
-    feedHash:
-      "0x1b8b079fe96e1749f6418405e91407790689623dee8dc123ae26eb833c9d9bd5",
-  },
   [tokens.POPCAT]: {
     feedId: "FTcFqwCjAgv2VMaowQ9XSBcesVzFzZkaju25nKio6bki",
     feedHash:

package/src/externalSdks/marginfi/types/oracleSetup.ts

@@ -15,6 +15,27 @@ export enum OracleSetup {
   PythPushOracle,
   SwitchboardPull,
   StakedWithPythPush,
+  KaminoPythPush,
+  KaminoSwitchboardPull,
+  Fixed,
+  DriftPythPull,
+  DriftSwitchboardPull,
+  SolendPythPull,
+  SolendSwitchboardPull,
+  FixedKamino,
+  FixedDrift,
+  JuplendPythPull,
+  JuplendSwitchboardPull,
+  FixedJuplend,
+  Scope,
+  PythMSOL,
+  KaminoMSOL,
+  JuplendMSOL,
+  PythLST,
+  KaminoLST,
+  JuplendLST,
+  PTPyth,
+  PTFixed,
 }
 
 export type OracleSetupArgs = OracleSetup;

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -30,8 +30,8 @@ import {
   fromBaseUnit,
   getBankLiquidityAvailableBaseUnit,
   getEmptyMarginfiAccountsByAuthority,
-  getAccountMeta,
   getMarginfiPriceOracle,
+  getMarginfiBankHealthAccounts,
   getRemainingAccountsForMarginfiHealthCheck,
   getTokenAccount,
   rpcAccountCreated,
@@ -129,16 +129,15 @@ export class MarginfiFlProvider extends FlProviderBase {
         data: this.debtBankLiquiditySource,
       }),
     ]);
-    this.supplyBankHealthAccounts = [
-      getAccountMeta(
-        toWeb3JsPublicKey(this.supplyBankLiquiditySource.publicKey)
-      ),
-      getAccountMeta(supplyPriceOracle),
-    ];
-    this.debtBankHealthAccounts = [
-      getAccountMeta(toWeb3JsPublicKey(this.debtBankLiquiditySource.publicKey)),
-      getAccountMeta(debtPriceOracle),
-    ];
+    [this.supplyBankHealthAccounts, this.debtBankHealthAccounts] =
+      await Promise.all([
+        getMarginfiBankHealthAccounts(
+          this.umi, this.supplyBankLiquiditySource, supplyPriceOracle
+        ),
+        getMarginfiBankHealthAccounts(
+          this.umi, this.debtBankLiquiditySource, debtPriceOracle
+        ),
+      ]);
   }
 
   private async setIntermediaryAccount(sources: TokenType[]) {

package/src/services/solauto/solautoMarginfiClient.ts

@@ -38,6 +38,8 @@ import {
   getRemainingAccountsForMarginfiHealthCheck,
   getAccountMeta,
   composeRemainingAccounts,
+  getMarginfiBankHealthAccounts,
+  getMarginfiAuxiliaryOracleAccounts,
 } from "../../utils";
 import {
   Bank,
@@ -48,6 +50,7 @@ import {
   lendingAccountWithdraw,
   marginfiAccountInitialize,
   safeFetchAllMarginfiAccount,
+  fetchAllBank,
 } from "../../externalSdks/marginfi";
 import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 
@@ -70,6 +73,9 @@ export class SolautoMarginfiClient extends SolautoClient {
 
   public supplyPriceOracle!: PublicKey;
   public debtPriceOracle!: PublicKey;
+  private supplyBankHealthAccounts!: AccountMeta[];
+  private debtBankHealthAccounts!: AccountMeta[];
+  private auxiliaryOracleAccounts: AccountMeta[] = [];
 
   async initialize(args: SolautoClientArgs) {
     await super.initialize(args);
@@ -144,6 +150,22 @@ export class SolautoMarginfiClient extends SolautoClient {
     [this.supplyPriceOracle, this.debtPriceOracle] =
       await this.pos.priceOracles();
 
+    const banks = await fetchAllBank(this.umi, [
+      publicKey(this.marginfiSupplyAccounts.bank),
+      publicKey(this.marginfiDebtAccounts.bank),
+    ]);
+    [this.supplyBankHealthAccounts, this.debtBankHealthAccounts] =
+      await Promise.all([
+        getMarginfiBankHealthAccounts(this.umi, banks[0], this.supplyPriceOracle),
+        getMarginfiBankHealthAccounts(this.umi, banks[1], this.debtPriceOracle),
+      ]);
+    this.auxiliaryOracleAccounts = Array.from(
+      new Set(
+        banks.flatMap(getMarginfiAuxiliaryOracleAccounts)
+          .map((key) => key.toString())
+      )
+    ).map((key) => getAccountMeta(new PublicKey(key)));
+
     this.log("Marginfi account:", this.marginfiAccountPk.toString());
     this.log("Supply price oracle:", this.supplyPriceOracle.toString());
     this.log("Debt price oracle:", this.debtPriceOracle.toString());
@@ -157,7 +179,13 @@ export class SolautoMarginfiClient extends SolautoClient {
   }
 
   lutAccountsToAdd(): PublicKey[] {
-    return [...super.lutAccountsToAdd(), this.marginfiAccountPk];
+    return [
+      ...super.lutAccountsToAdd(),
+      this.marginfiAccountPk,
+      ...this.auxiliaryOracleAccounts.map((account) =>
+        toWeb3JsPublicKey(account.pubkey)
+      ),
+    ];
   }
 
   marginfiAccountInitialize(marginfiAccount: Signer): TransactionBuilder {
@@ -244,7 +272,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       debtPriceOracle: publicKey(this.debtPriceOracle),
       solautoPosition: publicKey(this.pos.publicKey),
       priceType: priceType ?? PriceType.Realtime,
-    });
+    }).addRemainingAccounts(this.auxiliaryOracleAccounts);
   }
 
   protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder {
@@ -266,10 +294,7 @@ export class SolautoMarginfiClient extends SolautoClient {
             .includes(this.marginfiSupplyAccounts.bank)
         ) {
           this.healthCheckRemainingAccounts.push(
-            ...[
-              getAccountMeta(new PublicKey(this.marginfiSupplyAccounts.bank)),
-              getAccountMeta(this.supplyPriceOracle),
-            ]
+            ...this.supplyBankHealthAccounts
           );
         }
         return lendingAccountDeposit(this.umi, {
@@ -294,10 +319,7 @@ export class SolautoMarginfiClient extends SolautoClient {
           )
         ) {
           remainingAccounts.push(
-            ...[
-              getAccountMeta(new PublicKey(this.marginfiDebtAccounts.bank)),
-              getAccountMeta(this.debtPriceOracle),
-            ]
+            ...this.debtBankHealthAccounts
           );
         }
 
@@ -409,7 +431,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       vaultDebtTa,
       debtVaultAuthority,
       solautoAction: args,
-    });
+    }).addRemainingAccounts(this.auxiliaryOracleAccounts);
   }
 
   rebalanceIx(
@@ -489,6 +511,6 @@ export class SolautoMarginfiClient extends SolautoClient {
         data.flashLoan?.flFeeBps && isFirstRebalance
           ? data.flashLoan.flFeeBps
           : null,
-    });
+    }).addRemainingAccounts(this.auxiliaryOracleAccounts);
   }
 }

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -3,7 +3,6 @@ import { Bank, PriceBias, safeFetchAllBank } from "../externalSdks/marginfi";
 import { publicKey } from "@metaplex-foundation/umi";
 import {
   calcMarginfiMaxLtvAndLiqThresholdBps,
-  fetchTokenPrices,
   fromBaseUnit,
   getBankLiquidityAvailableBaseUnit,
   getBankLiquidityUsedBaseUnit,
@@ -13,6 +12,8 @@ import {
   tokenInfo,
   toRoundedUsdValue,
   validPubkey,
+  getMarginfiBankPrice,
+  safeGetMarginfiBankPrice,
 } from "../utils";
 import { getMarginfiAccounts } from "../constants";
 import { SolautoPositionEx } from "./solautoPositionEx";
@@ -31,6 +32,11 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   ): number | undefined {
     return (
       this._supplyPrice ??
+      safeGetMarginfiBankPrice(
+        this.supplyBank,
+        priceType,
+        !withoutBias ? PriceBias.Low : undefined
+      ) ??
       safeGetPrice(
         this.supplyMint,
         priceType,
@@ -42,6 +48,11 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   debtPrice(priceType?: PriceType, withoutBias?: boolean): number | undefined {
     return (
       this._debtPrice ??
+      safeGetMarginfiBankPrice(
+        this.debtBank,
+        priceType,
+        !withoutBias ? PriceBias.High : undefined
+      ) ??
       safeGetPrice(
         this.debtMint,
         priceType,
@@ -79,7 +90,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   async maxLtvAndLiqThresholdBps(): Promise<[number, number]> {
     const [supplyBank, debtBank] = await this.getBanks();
 
-    const [supplyPrice] = await fetchTokenPrices([this.supplyMint]);
+    const supplyPrice = await getMarginfiBankPrice(this.umi, supplyBank);
     const [maxLtvBps, liqThresholdBps] = calcMarginfiMaxLtvAndLiqThresholdBps(
       supplyBank,
       debtBank,
@@ -108,7 +119,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
       baseUnit: baseUnit,
       baseAmountUsdValue: toRoundedUsdValue(
         fromBaseUnit(baseUnit, tokenInfo(mint).decimals) *
-          (safeGetPrice(mint) ?? 0)
+          (safeGetMarginfiBankPrice(bank ?? null) ?? safeGetPrice(mint) ?? 0)
       ),
     };
   }

package/src/utils/marginfi/data.ts

@@ -18,7 +18,6 @@ import {
   safeFetchMarginfiAccount,
 } from "../../externalSdks/marginfi";
 import { ContextUpdates } from "../solautoUtils";
-import { fetchTokenPrices, safeGetPrice } from "../priceUtils";
 import { currentUnixSeconds, validPubkey } from "../generalUtils";
 import {
   bytesToI80F48,
@@ -32,6 +31,7 @@ import {
   calcMarginfiMaxLtvAndLiqThresholdBps,
   marginfiAccountEmpty,
 } from "./general";
+import { getMarginfiBankPrice } from "./prices";
 
 export async function getMarginfiMaxLtvAndLiqThresholdBps(
   umi: Umi,
@@ -76,10 +76,7 @@ export async function getMarginfiMaxLtvAndLiqThresholdBps(
   }
 
   if (!supplyPrice) {
-    const [price] = await fetchTokenPrices([
-      toWeb3JsPublicKey(supply.bank!.mint),
-    ]);
-    supplyPrice = price;
+    supplyPrice = await getMarginfiBankPrice(umi, supply.bank!);
   }
 
   if (!debt.bank || debt.bank === null) {
@@ -239,6 +236,7 @@ export function getBankLiquidityUsedBaseUnit(
 }
 
 async function getTokenUsage(
+  umi: Umi,
   bank: Bank | null,
   isAsset: boolean,
   shares: number,
@@ -251,10 +249,7 @@ async function getTokenUsage(
   let originationFee = 0;
 
   if (bank !== null) {
-    [marketPrice] = await fetchTokenPrices(
-      [toWeb3JsPublicKey(bank.mint)],
-      priceType
-    );
+    marketPrice = await getMarginfiBankPrice(umi, bank, priceType);
     const [assetShareValue, liabilityShareValue] = getUpToDateShareValues(bank);
     const shareValue = isAsset ? assetShareValue : liabilityShareValue;
     amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
@@ -365,10 +360,6 @@ export async function getMarginfiAccountPositionState(
   let supplyUsage: PositionTokenState | undefined = undefined;
   let debtUsage: PositionTokenState | undefined = undefined;
 
-  if (supply.mint && debt.mint) {
-    await fetchTokenPrices([supply.mint, debt.mint]);
-  }
-
   if (
     marginfiAccount !== null &&
     marginfiAccount.lendingAccount.balances.filter((x) => x.active).length > 0
@@ -397,6 +388,7 @@ export async function getMarginfiAccountPositionState(
         supply.mint = toWeb3JsPublicKey(supplyBank!.mint);
       }
       supplyUsage = await getTokenUsage(
+        umi,
         supplyBank!,
         true,
         bytesToI80F48(supplyBalances[0].assetShares.value),
@@ -415,6 +407,7 @@ export async function getMarginfiAccountPositionState(
         debt.mint = toWeb3JsPublicKey(debtBank!.mint);
       }
       debtUsage = await getTokenUsage(
+        umi,
         debtBank!,
         false,
         bytesToI80F48(debtBalances[0].liabilityShares.value),
@@ -430,10 +423,12 @@ export async function getMarginfiAccountPositionState(
 
   if (!supplyUsage) {
     supplyUsage = await getTokenUsage(
+      umi,
       supplyBank,
       true,
       0,
-      contextUpdates?.supplyAdjustment
+      contextUpdates?.supplyAdjustment,
+      priceType
     );
   }
 
@@ -458,17 +453,22 @@ export async function getMarginfiAccountPositionState(
 
   if (!debtUsage) {
     debtUsage = await getTokenUsage(
+      umi,
       debtBank,
       false,
       0,
-      contextUpdates?.debtAdjustment
+      contextUpdates?.debtAdjustment,
+      priceType
     );
   }
 
   if (!marginfiGroup) {
     marginfiGroup = toWeb3JsPublicKey(supplyBank.group);
   }
-  const supplyPrice = safeGetPrice(toWeb3JsPublicKey(supplyBank.mint))!;
+  const supplyPrice = fromBaseUnit(
+    supplyUsage.baseAmountMarketPriceUsd,
+    USD_DECIMALS
+  );
   let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(
     umi,
     marginfiGroup,