@haven-fi/solauto-sdk 1.0.835 → 1.0.837

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

@@ -1 +1 @@
-{"version":3,"file":"switchboardConstants.d.ts","sourceRoot":"","sources":["../../src/constants/switchboardConstants.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAGD,eAAO,MAAM,0BAA0B,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;CA+CxE,CAAC"}
+{"version":3,"file":"switchboardConstants.d.ts","sourceRoot":"","sources":["../../src/constants/switchboardConstants.ts"],"names":[],"mappings":"AAEA,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAKD,eAAO,MAAM,0BAA0B,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;CAqBxE,CAAC"}

package/dist/constants/switchboardConstants.js

@@ -34,34 +34,11 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SWITCHBOARD_PRICE_FEED_IDS = void 0;
-const spl_token_1 = require("@solana/spl-token");
 const tokens = __importStar(require("./tokenConstants"));
 // 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.
 exports.SWITCHBOARD_PRICE_FEED_IDS = {
-    [spl_token_1.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: "0xeb4f9a43024f8f33786b7291404510af8e94a66e1acb44953a3137878ee7033f",

package/dist/externalSdks/marginfi/types/oracleSetup.d.ts

@@ -12,7 +12,28 @@ export declare enum OracleSetup {
     SwitchboardLegacy = 2,
     PythPushOracle = 3,
     SwitchboardPull = 4,
-    StakedWithPythPush = 5
+    StakedWithPythPush = 5,
+    KaminoPythPush = 6,
+    KaminoSwitchboardPull = 7,
+    Fixed = 8,
+    DriftPythPull = 9,
+    DriftSwitchboardPull = 10,
+    SolendPythPull = 11,
+    SolendSwitchboardPull = 12,
+    FixedKamino = 13,
+    FixedDrift = 14,
+    JuplendPythPull = 15,
+    JuplendSwitchboardPull = 16,
+    FixedJuplend = 17,
+    Scope = 18,
+    PythMSOL = 19,
+    KaminoMSOL = 20,
+    JuplendMSOL = 21,
+    PythLST = 22,
+    KaminoLST = 23,
+    JuplendLST = 24,
+    PTPyth = 25,
+    PTFixed = 26
 }
 export type OracleSetupArgs = OracleSetup;
 export declare function getOracleSetupSerializer(): Serializer<OracleSetupArgs, OracleSetup>;

package/dist/externalSdks/marginfi/types/oracleSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracleSetup.d.ts","sourceRoot":"","sources":["../../../../src/externalSdks/marginfi/types/oracleSetup.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,UAAU,IAAA;IACV,iBAAiB,IAAA;IACjB,cAAc,IAAA;IACd,eAAe,IAAA;IACf,kBAAkB,IAAA;CACnB;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;AAE1C,wBAAgB,wBAAwB,IAAI,UAAU,CACpD,eAAe,EACf,WAAW,CACZ,CAIA"}
+{"version":3,"file":"oracleSetup.d.ts","sourceRoot":"","sources":["../../../../src/externalSdks/marginfi/types/oracleSetup.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,UAAU,IAAA;IACV,iBAAiB,IAAA;IACjB,cAAc,IAAA;IACd,eAAe,IAAA;IACf,kBAAkB,IAAA;IAClB,cAAc,IAAA;IACd,qBAAqB,IAAA;IACrB,KAAK,IAAA;IACL,aAAa,IAAA;IACb,oBAAoB,KAAA;IACpB,cAAc,KAAA;IACd,qBAAqB,KAAA;IACrB,WAAW,KAAA;IACX,UAAU,KAAA;IACV,eAAe,KAAA;IACf,sBAAsB,KAAA;IACtB,YAAY,KAAA;IACZ,KAAK,KAAA;IACL,QAAQ,KAAA;IACR,UAAU,KAAA;IACV,WAAW,KAAA;IACX,OAAO,KAAA;IACP,SAAS,KAAA;IACT,UAAU,KAAA;IACV,MAAM,KAAA;IACN,OAAO,KAAA;CACR;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;AAE1C,wBAAgB,wBAAwB,IAAI,UAAU,CACpD,eAAe,EACf,WAAW,CACZ,CAIA"}

package/dist/externalSdks/marginfi/types/oracleSetup.js

@@ -18,6 +18,27 @@ var OracleSetup;
     OracleSetup[OracleSetup["PythPushOracle"] = 3] = "PythPushOracle";
     OracleSetup[OracleSetup["SwitchboardPull"] = 4] = "SwitchboardPull";
     OracleSetup[OracleSetup["StakedWithPythPush"] = 5] = "StakedWithPythPush";
+    OracleSetup[OracleSetup["KaminoPythPush"] = 6] = "KaminoPythPush";
+    OracleSetup[OracleSetup["KaminoSwitchboardPull"] = 7] = "KaminoSwitchboardPull";
+    OracleSetup[OracleSetup["Fixed"] = 8] = "Fixed";
+    OracleSetup[OracleSetup["DriftPythPull"] = 9] = "DriftPythPull";
+    OracleSetup[OracleSetup["DriftSwitchboardPull"] = 10] = "DriftSwitchboardPull";
+    OracleSetup[OracleSetup["SolendPythPull"] = 11] = "SolendPythPull";
+    OracleSetup[OracleSetup["SolendSwitchboardPull"] = 12] = "SolendSwitchboardPull";
+    OracleSetup[OracleSetup["FixedKamino"] = 13] = "FixedKamino";
+    OracleSetup[OracleSetup["FixedDrift"] = 14] = "FixedDrift";
+    OracleSetup[OracleSetup["JuplendPythPull"] = 15] = "JuplendPythPull";
+    OracleSetup[OracleSetup["JuplendSwitchboardPull"] = 16] = "JuplendSwitchboardPull";
+    OracleSetup[OracleSetup["FixedJuplend"] = 17] = "FixedJuplend";
+    OracleSetup[OracleSetup["Scope"] = 18] = "Scope";
+    OracleSetup[OracleSetup["PythMSOL"] = 19] = "PythMSOL";
+    OracleSetup[OracleSetup["KaminoMSOL"] = 20] = "KaminoMSOL";
+    OracleSetup[OracleSetup["JuplendMSOL"] = 21] = "JuplendMSOL";
+    OracleSetup[OracleSetup["PythLST"] = 22] = "PythLST";
+    OracleSetup[OracleSetup["KaminoLST"] = 23] = "KaminoLST";
+    OracleSetup[OracleSetup["JuplendLST"] = 24] = "JuplendLST";
+    OracleSetup[OracleSetup["PTPyth"] = 25] = "PTPyth";
+    OracleSetup[OracleSetup["PTFixed"] = 26] = "PTFixed";
 })(OracleSetup || (exports.OracleSetup = OracleSetup = {}));
 function getOracleSetupSerializer() {
     return (0, serializers_1.scalarEnum)(OracleSetup, {

package/dist/services/flashLoans/marginfiFlProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAclC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAmBlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ5C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IAEvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IACtC,OAAO,CAAC,uBAAuB,CAAiB;IAChD,OAAO,CAAC,qBAAqB,CAAiB;IAC9C,OAAO,CAAC,wBAAwB,CAAiB;IACjD,OAAO,CAAC,sBAAsB,CAAiB;IAEzC,UAAU;YAiBF,iBAAiB;YAgEjB,sBAAsB;IAsD9B,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAI7C,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,kBAAkB;IAM1B,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAsDrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IAiD3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}
+{"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAclC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAmBlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ5C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IAEvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IACtC,OAAO,CAAC,uBAAuB,CAAiB;IAChD,OAAO,CAAC,qBAAqB,CAAiB;IAC9C,OAAO,CAAC,wBAAwB,CAAiB;IACjD,OAAO,CAAC,sBAAsB,CAAiB;IAEzC,UAAU;YAiBF,iBAAiB;YA+DjB,sBAAsB;IAsD9B,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAI7C,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,kBAAkB;IAM1B,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAsDrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IAiD3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}

package/dist/services/flashLoans/marginfiFlProvider.js

@@ -59,14 +59,11 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
                 data: this.debtBankLiquiditySource,
             }),
         ]);
-        this.supplyBankHealthAccounts = [
-            (0, utils_1.getAccountMeta)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.supplyBankLiquiditySource.publicKey)),
-            (0, utils_1.getAccountMeta)(supplyPriceOracle),
-        ];
-        this.debtBankHealthAccounts = [
-            (0, utils_1.getAccountMeta)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.debtBankLiquiditySource.publicKey)),
-            (0, utils_1.getAccountMeta)(debtPriceOracle),
-        ];
+        [this.supplyBankHealthAccounts, this.debtBankHealthAccounts] =
+            await Promise.all([
+                (0, utils_1.getMarginfiBankHealthAccounts)(this.umi, this.supplyBankLiquiditySource, supplyPriceOracle),
+                (0, utils_1.getMarginfiBankHealthAccounts)(this.umi, this.debtBankLiquiditySource, debtPriceOracle),
+            ]);
     }
     async setIntermediaryAccount(sources) {
         const compatibleMarginfiAccounts = this.existingMarginfiAccounts.filter((x) => x.group.toString() == this.liquidityBank(sources[0]).group);

package/dist/services/solauto/solautoMarginfiClient.d.ts

@@ -15,6 +15,9 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     marginfiDebtAccounts: MarginfiAssetAccounts;
     supplyPriceOracle: PublicKey;
     debtPriceOracle: PublicKey;
+    private supplyBankHealthAccounts;
+    private debtBankHealthAccounts;
+    private auxiliaryOracleAccounts;
     initialize(args: SolautoClientArgs): Promise<void>;
     defaultLookupTables(): string[];
     lutAccountsToAdd(): PublicKey[];

package/dist/services/solauto/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAIlB,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAuB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EAEf,SAAS,EAET,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAoBzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,WAAW,EAAG,uBAAuB,CAAC;IAEtC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,4BAA4B,EAAG,WAAW,EAAE,CAAC;IAC7C,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA8ExC,mBAAmB,IAAI,MAAM,EAAE;IAO/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,kBAAkB;IAepD,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAiGrC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CA4EtB"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAIlB,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAuB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EAEf,SAAS,EAET,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAuBzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,WAAW,EAAG,uBAAuB,CAAC;IAEtC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,4BAA4B,EAAG,WAAW,EAAE,CAAC;IAC7C,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IACnC,OAAO,CAAC,wBAAwB,CAAiB;IACjD,OAAO,CAAC,sBAAsB,CAAiB;IAC/C,OAAO,CAAC,uBAAuB,CAAqB;IAE9C,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA8FxC,mBAAmB,IAAI,MAAM,EAAE;IAO/B,gBAAgB,IAAI,SAAS,EAAE;IAU/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,kBAAkB;IAepD,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IA2FrC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CA4EtB"}

package/dist/services/solauto/solautoMarginfiClient.js

@@ -16,6 +16,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     constructor() {
         super(...arguments);
         this.lendingPlatform = generated_1.LendingPlatform.Marginfi;
+        this.auxiliaryOracleAccounts = [];
     }
     async initialize(args) {
         await super.initialize(args);
@@ -58,6 +59,17 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][this.pos.debtMint.toString()];
         [this.supplyPriceOracle, this.debtPriceOracle] =
             await this.pos.priceOracles();
+        const banks = await (0, marginfi_1.fetchAllBank)(this.umi, [
+            (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+            (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+        ]);
+        [this.supplyBankHealthAccounts, this.debtBankHealthAccounts] =
+            await Promise.all([
+                (0, utils_1.getMarginfiBankHealthAccounts)(this.umi, banks[0], this.supplyPriceOracle),
+                (0, utils_1.getMarginfiBankHealthAccounts)(this.umi, banks[1], this.debtPriceOracle),
+            ]);
+        this.auxiliaryOracleAccounts = Array.from(new Set(banks.flatMap(utils_1.getMarginfiAuxiliaryOracleAccounts)
+            .map((key) => key.toString()))).map((key) => (0, utils_1.getAccountMeta)(new web3_js_1.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());
@@ -69,7 +81,11 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         ];
     }
     lutAccountsToAdd() {
-        return [...super.lutAccountsToAdd(), this.marginfiAccountPk];
+        return [
+            ...super.lutAccountsToAdd(),
+            this.marginfiAccountPk,
+            ...this.auxiliaryOracleAccounts.map((account) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(account.pubkey)),
+        ];
     }
     marginfiAccountInitialize(marginfiAccount) {
         return (0, marginfi_1.marginfiAccountInitialize)(this.umi, {
@@ -142,7 +158,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
             priceType: priceType ?? generated_1.PriceType.Realtime,
-        });
+        }).addRemainingAccounts(this.auxiliaryOracleAccounts);
     }
     protocolInteractionIx(args) {
         let tx = super.protocolInteractionIx(args);
@@ -159,10 +175,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 if (!this.healthCheckRemainingAccounts
                     .map((x) => x.pubkey.toString())
                     .includes(this.marginfiSupplyAccounts.bank)) {
-                    this.healthCheckRemainingAccounts.push(...[
-                        (0, utils_1.getAccountMeta)(new web3_js_1.PublicKey(this.marginfiSupplyAccounts.bank)),
-                        (0, utils_1.getAccountMeta)(this.supplyPriceOracle),
-                    ]);
+                    this.healthCheckRemainingAccounts.push(...this.supplyBankHealthAccounts);
                 }
                 return (0, marginfi_1.lendingAccountDeposit)(this.umi, {
                     signer: this.signer,
@@ -178,10 +191,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             case "Borrow": {
                 const remainingAccounts = this.healthCheckRemainingAccounts;
                 if (!remainingAccounts.find((x) => x.pubkey.toString() === this.marginfiDebtAccounts.bank.toString())) {
-                    remainingAccounts.push(...[
-                        (0, utils_1.getAccountMeta)(new web3_js_1.PublicKey(this.marginfiDebtAccounts.bank)),
-                        (0, utils_1.getAccountMeta)(this.debtPriceOracle),
-                    ]);
+                    remainingAccounts.push(...this.debtBankHealthAccounts);
                 }
                 return (0, marginfi_1.lendingAccountBorrow)(this.umi, {
                     amount: args.fields[0],
@@ -265,7 +275,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             vaultDebtTa,
             debtVaultAuthority,
             solautoAction: args,
-        });
+        }).addRemainingAccounts(this.auxiliaryOracleAccounts);
     }
     rebalanceIx(rebalanceStep, data) {
         const preSwapRebalance = rebalanceStep === generated_1.RebalanceStep.PreSwap;
@@ -322,7 +332,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             flashLoanFeeBps: data.flashLoan?.flFeeBps && isFirstRebalance
                 ? data.flashLoan.flFeeBps
                 : null,
-        });
+        }).addRemainingAccounts(this.auxiliaryOracleAccounts);
     }
 }
 exports.SolautoMarginfiClient = SolautoMarginfiClient;

package/dist/services/transactions/manager/transactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/transactionsManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/transactionsManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAIL,aAAa,EAKd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAEL,YAAY,EACZ,eAAe,EAEhB,MAAM,UAAU,CAAC;AAGlB,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,0BAA0B,GAAG,wBAAwB,EAAE,CAAC;AAEpE,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,SAAS;IAC1D,SAAS,EAAE,CAAC,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChE,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,SAAS;IAClD,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAC1E,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAM;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;gBAEhC,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC;YAoB9B,uBAAuB;IAwDrC,OAAO,CAAC,YAAY;YAiCN,aAAa;IAwB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAkBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;IAgCtC,OAAO,CAAC,mBAAmB;YA0Bb,eAAe;YAkDf,6BAA6B;YA8D7B,kCAAkC;YAUlC,cAAc;YA0Ed,qBAAqB;cA0DnB,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;IAqChC,OAAO,CAAC,gBAAgB;CAuCzB"}

package/dist/services/transactions/manager/transactionsManager.js

@@ -309,7 +309,8 @@ class TransactionsManager {
                 const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError, currentIndex);
                 itemSet = refreshedSets ? refreshedSets[0] : undefined;
             }
-            if (!itemSet || !this.shouldProceedToSend([itemSet], attemptNum)) {
+            if (!itemSet ||
+                !this.shouldProceedToSend(itemSets.slice(currentIndex), attemptNum)) {
                 return;
             }
             const tx = await itemSet.getSingleTransaction();

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,EAA+B,MAAM,0BAA0B,CAAC;AAgB7E,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,WAAW,CACT,SAAS,CAAC,EAAE,SAAS,EACrB,WAAW,CAAC,EAAE,OAAO,GACpB,MAAM,GAAG,SAAS;IAWrB,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IAW3E,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;IAED,IAAI,qBAAqB,IAAI,MAAM,CAUlC;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,0BAA0B,CAAC;AAiB7E,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,WAAW,CACT,SAAS,CAAC,EAAE,SAAS,EACrB,WAAW,CAAC,EAAE,OAAO,GACpB,MAAM,GAAG,SAAS;IAgBrB,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IAgB3E,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;IAED,IAAI,qBAAqB,IAAI,MAAM,CAUlC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -18,10 +18,12 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
     }
     supplyPrice(priceType, withoutBias) {
         return (this._supplyPrice ??
+            (0, utils_1.safeGetMarginfiBankPrice)(this.supplyBank, priceType, !withoutBias ? marginfi_1.PriceBias.Low : undefined) ??
             (0, utils_1.safeGetPrice)(this.supplyMint, priceType, !withoutBias ? marginfi_1.PriceBias.Low : undefined));
     }
     debtPrice(priceType, withoutBias) {
         return (this._debtPrice ??
+            (0, utils_1.safeGetMarginfiBankPrice)(this.debtBank, priceType, !withoutBias ? marginfi_1.PriceBias.High : undefined) ??
             (0, utils_1.safeGetPrice)(this.debtMint, priceType, !withoutBias ? marginfi_1.PriceBias.High : undefined));
     }
     getBankAccounts(mint) {
@@ -47,7 +49,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
     }
     async maxLtvAndLiqThresholdBps() {
         const [supplyBank, debtBank] = await this.getBanks();
-        const [supplyPrice] = await (0, utils_1.fetchTokenPrices)([this.supplyMint]);
+        const supplyPrice = await (0, utils_1.getMarginfiBankPrice)(this.umi, supplyBank);
         const [maxLtvBps, liqThresholdBps] = (0, utils_1.calcMarginfiMaxLtvAndLiqThresholdBps)(supplyBank, debtBank, supplyPrice);
         return [maxLtvBps, liqThresholdBps];
     }
@@ -58,7 +60,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
         return {
             baseUnit: baseUnit,
             baseAmountUsdValue: (0, utils_1.toRoundedUsdValue)((0, utils_1.fromBaseUnit)(baseUnit, (0, utils_1.tokenInfo)(mint).decimals) *
-                ((0, utils_1.safeGetPrice)(mint) ?? 0)),
+                ((0, utils_1.safeGetMarginfiBankPrice)(bank ?? null) ?? (0, utils_1.safeGetPrice)(mint) ?? 0)),
         };
     }
     updateSupplyLiquidityDepositable(banks) {

package/dist/utils/marginfi/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAsB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO/E,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAgBjD,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8C3B;AAED,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,eAAe,EAAE,CAAC,CA6B5B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,KAAK,EAAE,OAAO,UAgBf;AA0DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAwBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAChE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACN;IACE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,aAAa,EAAE,SAAS,CAAC;IACzB,KAAK,EAAE,aAAa,CAAC;CACtB,GACD,SAAS,CACZ,CAmLA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAsB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO/E,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAgBjD,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA2C3B;AAED,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,eAAe,EAAE,CAAC,CA6B5B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,KAAK,EAAE,OAAO,UAgBf;AAwDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAwBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAChE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACN;IACE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,aAAa,EAAE,SAAS,CAAC;IACzB,KAAK,EAAE,aAAa,CAAC;CACtB,GACD,SAAS,CACZ,CAwLA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE"}

package/dist/utils/marginfi/data.js

@@ -13,10 +13,10 @@ const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const constants_1 = require("../../constants");
 const marginfi_1 = require("../../externalSdks/marginfi");
-const priceUtils_1 = require("../priceUtils");
 const generalUtils_1 = require("../generalUtils");
 const numberUtils_1 = require("../numberUtils");
 const general_1 = require("./general");
+const prices_1 = require("./prices");
 async function getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup, supply, debt, supplyPrice) {
     if (!supply.bank && !(0, generalUtils_1.validPubkey)(supply.mint)) {
         return [0, 0];
@@ -29,10 +29,7 @@ async function getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup, supply, d
         debt.bank = await (0, marginfi_1.safeFetchBank)(umi, (0, umi_1.publicKey)(bankAccounts[marginfiGroup.toString()][debt.mint.toString()].bank), { commitment: "confirmed" });
     }
     if (!supplyPrice) {
-        const [price] = await (0, priceUtils_1.fetchTokenPrices)([
-            (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supply.bank.mint),
-        ]);
-        supplyPrice = price;
+        supplyPrice = await (0, prices_1.getMarginfiBankPrice)(umi, supply.bank);
     }
     if (!debt.bank || debt.bank === null) {
         return [0, 0];
@@ -138,13 +135,13 @@ function getBankLiquidityUsedBaseUnit(bank, asset) {
     }
     return BigInt(Math.floor(amountUsed));
 }
-async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment, priceType) {
+async function getTokenUsage(umi, 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)], priceType);
+        marketPrice = await (0, prices_1.getMarginfiBankPrice)(umi, bank, priceType);
         const [assetShareValue, liabilityShareValue] = getUpToDateShareValues(bank);
         const shareValue = isAsset ? assetShareValue : liabilityShareValue;
         amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
@@ -202,9 +199,6 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
     let debtBank = await getBank(umi, debt, marginfiGroup);
     let supplyUsage = undefined;
     let debtUsage = undefined;
-    if (supply.mint && debt.mint) {
-        await (0, priceUtils_1.fetchTokenPrices)([supply.mint, debt.mint]);
-    }
     if (marginfiAccount !== null &&
         marginfiAccount.lendingAccount.balances.filter((x) => x.active).length > 0) {
         const supplyBalances = marginfiAccount.lendingAccount.balances.filter((balance) => balance.active && (0, numberUtils_1.bytesToI80F48)(balance.assetShares.value) > 0);
@@ -222,7 +216,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, priceType);
+            supplyUsage = await getTokenUsage(umi, supplyBank, true, (0, numberUtils_1.bytesToI80F48)(supplyBalances[0].assetShares.value), contextUpdates?.supplyAdjustment, priceType);
         }
         if (debtBalances.length > 0) {
             if (debtBank === null) {
@@ -233,14 +227,14 @@ 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, priceType);
+            debtUsage = await getTokenUsage(umi, debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), contextUpdates?.debtAdjustment, priceType);
         }
     }
     if (supplyBank === null) {
         return undefined;
     }
     if (!supplyUsage) {
-        supplyUsage = await getTokenUsage(supplyBank, true, 0, contextUpdates?.supplyAdjustment);
+        supplyUsage = await getTokenUsage(umi, supplyBank, true, 0, contextUpdates?.supplyAdjustment, priceType);
     }
     if (debtBank === null) {
         return undefined;
@@ -257,12 +251,12 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
         return undefined;
     }
     if (!debtUsage) {
-        debtUsage = await getTokenUsage(debtBank, false, 0, contextUpdates?.debtAdjustment);
+        debtUsage = await getTokenUsage(umi, debtBank, false, 0, contextUpdates?.debtAdjustment, priceType);
     }
     if (!marginfiGroup) {
         marginfiGroup = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.group);
     }
-    const supplyPrice = (0, priceUtils_1.safeGetPrice)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint));
+    const supplyPrice = (0, numberUtils_1.fromBaseUnit)(supplyUsage.baseAmountMarketPriceUsd, constants_1.USD_DECIMALS);
     let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup, {
         mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint),
         bank: supplyBank,

package/dist/utils/marginfi/general.d.ts

@@ -16,6 +16,11 @@ export declare function getMarginfiPriceOracle(umi: Umi, bank: {
     pk?: PublicKey;
     data?: Bank;
 }): Promise<PublicKey>;
+export type MarginfiHealthAccountMeta = AccountMeta & {
+    oracleAccountCount?: number;
+};
+export declare function getMarginfiAuxiliaryOracleAccounts(bank: Bank): PublicKey[];
+export declare function getMarginfiBankHealthAccounts(umi: Umi, bank: Bank, priceOracle?: PublicKey): Promise<MarginfiHealthAccountMeta[]>;
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
     mint: PublicKey;
 }

package/dist/utils/marginfi/general.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAEL,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,6BAA6B,CAAC;AASrC,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CA8BtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAiBtC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAoB3E"}
+{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAEL,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,6BAA6B,CAAC;AASrC,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CA8BtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAiBtC;AAGD,MAAM,MAAM,yBAAyB,GAAG,WAAW,GAAG;IACpD,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,EAAE,CAS1E;AAED,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,WAAW,CAAC,EAAE,SAAS,GACtB,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAYtC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAMxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAyB3E"}

package/dist/utils/marginfi/general.js

@@ -5,6 +5,8 @@ exports.umiWithMarginfiProgram = umiWithMarginfiProgram;
 exports.getAllBankRelatedAccounts = getAllBankRelatedAccounts;
 exports.fetchBankAddresses = fetchBankAddresses;
 exports.getMarginfiPriceOracle = getMarginfiPriceOracle;
+exports.getMarginfiAuxiliaryOracleAccounts = getMarginfiAuxiliaryOracleAccounts;
+exports.getMarginfiBankHealthAccounts = getMarginfiBankHealthAccounts;
 exports.findMarginfiAccounts = findMarginfiAccounts;
 exports.getRemainingAccountsForMarginfiHealthCheck = getRemainingAccountsForMarginfiHealthCheck;
 exports.calcMarginfiMaxLtvAndLiqThresholdBps = calcMarginfiMaxLtvAndLiqThresholdBps;
@@ -84,6 +86,29 @@ async function getMarginfiPriceOracle(umi, bank) {
         : (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.data.config.oracleKeys[0]);
     return priceOracle;
 }
+function getMarginfiAuxiliaryOracleAccounts(bank) {
+    if (bank.config.oracleSetup !== marginfi_1.OracleSetup.PythLST) {
+        return [];
+    }
+    const pool = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.config.oracleKeys[1]);
+    if (!(0, generalUtils_1.validPubkey)(pool)) {
+        throw new Error(`Missing PythLST stake pool for bank ${bank.publicKey}`);
+    }
+    return [pool];
+}
+async function getMarginfiBankHealthAccounts(umi, bank, priceOracle) {
+    const oracles = [
+        priceOracle ?? (await getMarginfiPriceOracle(umi, { data: bank })),
+        ...getMarginfiAuxiliaryOracleAccounts(bank),
+    ];
+    return [
+        {
+            ...(0, solanaUtils_1.getAccountMeta)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.publicKey)),
+            oracleAccountCount: oracles.length,
+        },
+        ...oracles.map((oracle) => (0, solanaUtils_1.getAccountMeta)(oracle)),
+    ];
+}
 function findMarginfiAccounts(bank) {
     const search = (bankAccounts) => {
         for (const group in bankAccounts) {
@@ -110,13 +135,8 @@ async function getRemainingAccountsForMarginfiHealthCheck(umi, balance) {
     if (!balance.active) {
         return [];
     }
-    const priceOracle = await getMarginfiPriceOracle(umi, {
-        pk: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(balance.bankPk),
-    });
-    return [
-        (0, solanaUtils_1.getAccountMeta)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(balance.bankPk)),
-        (0, solanaUtils_1.getAccountMeta)(priceOracle),
-    ];
+    const bank = await (0, marginfi_1.fetchBank)(umi, balance.bankPk);
+    return getMarginfiBankHealthAccounts(umi, bank);
 }
 function calcMarginfiMaxLtvAndLiqThresholdBps(supplyBank, debtBank, supplyPrice) {
     let maxLtv = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightInit.value) /
@@ -139,7 +159,15 @@ function marginfiAccountEmpty(marginfiAccount) {
             (0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value) > 0.000001)) === undefined);
 }
 function composeRemainingAccounts(accs) {
-    const banksAndOracles = accs.reduce((acc, _, i) => i % 2 === 0 ? [...acc, [accs[i], accs[i + 1]]] : acc, []);
+    const banksAndOracles = [];
+    for (let i = 0; i < accs.length;) {
+        const count = 1 + (accs[i].oracleAccountCount ?? 1);
+        if (!Number.isInteger(count) || count < 2 || i + count > accs.length) {
+            throw new Error("Incomplete Marginfi bank oracle accounts");
+        }
+        banksAndOracles.push(accs.slice(i, i + count));
+        i += count;
+    }
     return banksAndOracles
         .sort((a, b) => {
         const aBytes = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(a[0].pubkey).toBuffer();

package/dist/utils/marginfi/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./data";
 export * from "./general";
+export * from "./prices";
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/marginfi/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC"}

package/dist/utils/marginfi/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./data"), exports);
 __exportStar(require("./general"), exports);
+__exportStar(require("./prices"), exports);

package/dist/utils/marginfi/prices.d.ts

@@ -0,0 +1,14 @@
+import { RpcAccount, Umi } from "@metaplex-foundation/umi";
+import { Bank, PriceBias } from "../../externalSdks/marginfi";
+import { PriceType } from "../../generated";
+interface BankPrice {
+    realtimePrice: number;
+    emaPrice: number;
+    confInterval: number;
+    emaConfInterval: number;
+}
+export declare function getPythLstPriceData(bank: Bank, oracle: RpcAccount, stakePool: RpcAccount, clock: RpcAccount): BankPrice;
+export declare function safeGetMarginfiBankPrice(bank: Bank | null, type?: PriceType, bias?: PriceBias): number | undefined;
+export declare function getMarginfiBankPrice(umi: Umi, bank: Bank, type?: PriceType, bias?: PriceBias): Promise<number>;
+export {};
+//# sourceMappingURL=prices.d.ts.map

package/dist/utils/marginfi/prices.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prices.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/prices.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,UAAU,EACV,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,IAAI,EAAe,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE3E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAW5C,UAAU,SAAS;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB;AAeD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,UAAU,EACrB,KAAK,EAAE,UAAU,GAChB,SAAS,CAsDX;AAiBD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,IAAI,CAAC,EAAE,SAAS,EAChB,IAAI,CAAC,EAAE,SAAS,sBAIjB;AAED,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,IAAI,CAAC,EAAE,SAAS,EAChB,IAAI,CAAC,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,CAkCjB"}