@haven-fi/solauto-sdk 1.0.70 → 1.0.72

package/dist/clients/solautoMarginfiClient.d.ts

@@ -20,6 +20,8 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     marginfiGroup: PublicKey;
     marginfiSupplyAccounts: MarginfiAssetAccounts;
     marginfiDebtAccounts: MarginfiAssetAccounts;
+    supplyPriceOracle: PublicKey;
+    debtPriceOracle: PublicKey;
     intermediaryMarginfiAccountSigner?: Signer;
     intermediaryMarginfiAccountPk: PublicKey;
     intermediaryMarginfiAccount?: MarginfiAccount;

package/dist/clients/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AASnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAG7C,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA0C1C,8BAA8B;IA0CpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA8C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA2DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAGL,eAAe,EAYhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AASnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,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;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAkD1C,8BAA8B;IA0CpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAU/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA8C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA2DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAgFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -40,12 +40,18 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.marginfiGroup = marginfiAccountData
             ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(marginfiAccountData.group)
             : args.marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP);
-        this.marginfiSupplyAccounts = (0, marginfiUtils_1.findMarginfiAccounts)({
-            mint: this.supplyMint.toString(),
-        });
-        this.marginfiDebtAccounts = (0, marginfiUtils_1.findMarginfiAccounts)({
-            mint: this.debtMint.toString(),
-        });
+        this.marginfiSupplyAccounts =
+            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.supplyMint.toString()];
+        this.marginfiDebtAccounts = marginfiAccounts_1.MARGINFI_ACCOUNTS[this.debtMint.toString()];
+        // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
+        // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
+        //   publicKey(this.marginfiSupplyAccounts.bank),
+        //   publicKey(this.marginfiDebtAccounts.bank),
+        // ]);
+        // this.supplyPriceOracle = toWeb3JsPublicKey(supplyBank.config.oracleKeys[0]);
+        // this.debtPriceOracle = toWeb3JsPublicKey(debtBank.config.oracleKeys[0]);
+        this.supplyPriceOracle = new web3_js_1.PublicKey(this.marginfiSupplyAccounts.priceOracle);
+        this.debtPriceOracle = new web3_js_1.PublicKey(this.marginfiDebtAccounts.priceOracle);
         if (!this.initialized) {
             await this.setIntermediaryMarginfiDetails();
         }
@@ -78,7 +84,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         return [
             ...super.lutAccountsToAdd(),
             this.marginfiAccountPk,
-            ...(this.signer.publicKey.toString() === this.authority.toString() ? [this.intermediaryMarginfiAccountPk] : []),
+            ...(this.signer.publicKey.toString() === this.authority.toString()
+                ? [this.intermediaryMarginfiAccountPk]
+                : []),
         ];
     }
     marginfiAccountInitialize() {
@@ -141,9 +149,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccount),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
-            supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.priceOracle),
+            supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
-            debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtAccounts.priceOracle),
+            debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
         });
     }
@@ -232,8 +240,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         let supplyPriceOracle = undefined;
         let debtPriceOracle = undefined;
         if (args.__kind === "Withdraw" || args.__kind === "Borrow") {
-            supplyPriceOracle = (0, umi_1.publicKey)(this.marginfiSupplyAccounts.priceOracle);
-            debtPriceOracle = (0, umi_1.publicKey)(this.marginfiDebtAccounts.priceOracle);
+            supplyPriceOracle = (0, umi_1.publicKey)(this.supplyPriceOracle);
+            debtPriceOracle = (0, umi_1.publicKey)(this.debtPriceOracle);
         }
         return (0, generated_1.marginfiProtocolInteraction)(this.umi, {
             signer: this.signer,
@@ -277,7 +285,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
             intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), swapDetails.inputMint)),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
-            supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.priceOracle),
+            supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
             signerSupplyTa: this.selfManaged
                 ? (0, umi_1.publicKey)(this.signerSupplyTa)
@@ -289,7 +297,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.vaultAuthority)
                 : undefined,
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
-            debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtAccounts.priceOracle),
+            debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             signerDebtTa: this.selfManaged ? (0, umi_1.publicKey)(this.signerDebtTa) : undefined,
             vaultDebtTa: needDebtAccounts
@@ -326,17 +334,21 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         }));
     }
     flashRepay(flashLoanDetails) {
-        const bank = flashLoanDetails.mint.equals(this.supplyMint)
-            ? this.marginfiSupplyAccounts
-            : this.marginfiDebtAccounts;
+        const accounts = flashLoanDetails.mint.equals(this.supplyMint)
+            ? { data: this.marginfiSupplyAccounts, oracle: this.supplyPriceOracle }
+            : { data: this.marginfiDebtAccounts, oracle: this.debtPriceOracle };
         const remainingAccounts = [];
         let includedFlashLoanToken = false;
         if (this.intermediaryMarginfiAccount) {
-            this.intermediaryMarginfiAccount.lendingAccount.balances.forEach((x) => {
+            this.intermediaryMarginfiAccount.lendingAccount.balances.forEach(async (x) => {
                 if (x.active) {
-                    if (x.bankPk === bank.bank) {
+                    if (x.bankPk === accounts.data.bank) {
                         includedFlashLoanToken = true;
                     }
+                    // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
+                    // const bankData = await safeFetchBank(this.umi, publicKey(accounts.data.bank));
+                    // const priceOracle = bankData!.config.oracleKeys[0];
+                    const priceOracle = (0, umi_1.publicKey)((0, marginfiUtils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.bankPk)).priceOracle);
                     remainingAccounts.push(...[
                         {
                             pubkey: x.bankPk,
@@ -344,8 +356,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                             isWritable: false,
                         },
                         {
-                            pubkey: (0, umi_1.publicKey)((0, marginfiUtils_1.findMarginfiAccounts)({ bank: x.bankPk.toString() })
-                                .priceOracle),
+                            pubkey: priceOracle,
                             isSigner: false,
                             isWritable: false,
                         },
@@ -356,12 +367,12 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         if (!this.intermediaryMarginfiAccount || !includedFlashLoanToken) {
             remainingAccounts.push(...[
                 {
-                    pubkey: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(new web3_js_1.PublicKey(bank.bank)),
+                    pubkey: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(new web3_js_1.PublicKey(accounts.data.bank)),
                     isSigner: false,
                     isWritable: false,
                 },
                 {
-                    pubkey: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(new web3_js_1.PublicKey(bank.priceOracle)),
+                    pubkey: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(new web3_js_1.PublicKey(accounts.oracle)),
                     isSigner: false,
                     isWritable: false,
                 },
@@ -371,8 +382,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             .add((0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
             amount: flashLoanDetails.baseUnitAmount,
             repayAll: null,
-            bank: (0, umi_1.publicKey)(bank.bank),
-            bankLiquidityVault: (0, umi_1.publicKey)(bank.liquidityVault),
+            bank: (0, umi_1.publicKey)(accounts.data.bank),
+            bankLiquidityVault: (0, umi_1.publicKey)(accounts.data.liquidityVault),
             marginfiAccount: (0, umi_1.publicKey)(this.intermediaryMarginfiAccountPk),
             marginfiGroup: (0, umi_1.publicKey)(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP),
             signer: this.signer,

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,eAAO,MAAM,sBAAsB,iDAAiD,CAAC;AAErF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;CAerE,CAAC;AAEF,eAAO,MAAM,8BAA8B,iDAAiD,CAAC"}
+{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,eAAO,MAAM,sBAAsB,iDAAiD,CAAC;AAErF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;CAyBrE,CAAC;AAEF,eAAO,MAAM,8BAA8B,iDAAiD,CAAC"}

package/dist/constants/marginfiAccounts.js

@@ -5,19 +5,29 @@ const spl_token_1 = require("@solana/spl-token");
 const tokenConstants_1 = require("./tokenConstants");
 exports.DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 exports.MARGINFI_ACCOUNTS = {
-    SOL: {
-        mint: spl_token_1.NATIVE_MINT.toString(),
+    [spl_token_1.NATIVE_MINT.toString()]: {
         bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
         liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
         vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
         priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE"
     },
-    USDC: {
-        mint: tokenConstants_1.USDC_MINT,
+    [tokenConstants_1.USDC_MINT]: {
         bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
         liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
         vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
         priceOracle: "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX"
+    },
+    [tokenConstants_1.B_SOL]: {
+        bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
+        liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
+        vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
+        priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
+    },
+    [tokenConstants_1.JUP]: {
+        bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
+        liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
+        vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
+        priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
     }
 };
 exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";

package/dist/constants/pythConstants.d.ts

@@ -1,5 +1,7 @@
 export declare const PYTH_PRICE_FEED_IDS: {
     [x: string]: string;
     EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: string;
+    bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1: string;
+    JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN: string;
 };
 //# sourceMappingURL=pythConstants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pythConstants.d.ts","sourceRoot":"","sources":["../../src/constants/pythConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;;CAK/B,CAAC"}
+{"version":3,"file":"pythConstants.d.ts","sourceRoot":"","sources":["../../src/constants/pythConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;;;;CAO/B,CAAC"}

package/dist/constants/pythConstants.js

@@ -7,4 +7,6 @@ const tokenConstants_1 = require("./tokenConstants");
 exports.PYTH_PRICE_FEED_IDS = {
     [spl_token_1.NATIVE_MINT.toString()]: "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
     [tokenConstants_1.USDC_MINT]: "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+    [tokenConstants_1.B_SOL]: "0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c",
+    [tokenConstants_1.JUP]: "0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996",
 };

package/dist/constants/tokenConstants.d.ts

@@ -1,8 +1,14 @@
 export declare const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+export declare const B_SOL = "bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1";
+export declare const JUP = "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN";
 export declare const ALL_SUPPORTED_TOKENS: string[];
-export declare const TOKEN_DECIMALS: {
-    [x: string]: number;
-    EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: number;
+interface TokenInfo {
+    decimals: number;
+    isStableCoin?: boolean;
+    isLST?: boolean;
+}
+export declare const TOKEN_INFO: {
+    [key: string]: TokenInfo;
 };
-export declare const STABLECOINS: string[];
+export {};
 //# sourceMappingURL=tokenConstants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tokenConstants.d.ts","sourceRoot":"","sources":["../../src/constants/tokenConstants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS,iDAAiD,CAAC;AAGxE,eAAO,MAAM,oBAAoB,UAGhC,CAAC;AAEF,eAAO,MAAM,cAAc;;;CAG1B,CAAC;AAEF,eAAO,MAAM,WAAW,UAEvB,CAAC"}
+{"version":3,"file":"tokenConstants.d.ts","sourceRoot":"","sources":["../../src/constants/tokenConstants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS,iDAAiD,CAAC;AACxE,eAAO,MAAM,KAAK,gDAAgD,CAAC;AACnE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AAGjE,eAAO,MAAM,oBAAoB,UAKhC,CAAC;AAEF,UAAU,SAAS;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,UAAU,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAelD,CAAC"}

package/dist/constants/tokenConstants.js

@@ -1,17 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STABLECOINS = exports.TOKEN_DECIMALS = exports.ALL_SUPPORTED_TOKENS = exports.USDC_MINT = void 0;
+exports.TOKEN_INFO = exports.ALL_SUPPORTED_TOKENS = exports.JUP = exports.B_SOL = exports.USDC_MINT = void 0;
 const spl_token_1 = require("@solana/spl-token");
-// When adding token ensure a price feed is provided in pythConstants.ts & the token is added to the necessary lists below
+// When adding token ensure a price feed is provided in pythConstants.ts & the token is in TOKEN_INFO
 exports.USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+exports.B_SOL = "bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1";
+exports.JUP = "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN";
 exports.ALL_SUPPORTED_TOKENS = [
     spl_token_1.NATIVE_MINT.toString(),
     exports.USDC_MINT,
+    exports.B_SOL,
+    exports.JUP,
 ];
-exports.TOKEN_DECIMALS = {
-    [spl_token_1.NATIVE_MINT.toString()]: 9,
-    [exports.USDC_MINT]: 6
+exports.TOKEN_INFO = {
+    [spl_token_1.NATIVE_MINT.toString()]: {
+        decimals: 9,
+    },
+    [exports.USDC_MINT]: {
+        decimals: 6,
+        isStableCoin: true
+    },
+    [exports.B_SOL]: {
+        decimals: 9,
+        isLST: true
+    },
+    [exports.JUP]: {
+        decimals: 6
+    }
 };
-exports.STABLECOINS = [
-    exports.USDC_MINT
-];

package/dist/generated/errors/solauto.d.ts

@@ -42,8 +42,8 @@ export declare class StaleProtocolDataError extends ProgramError {
     readonly code: number;
     constructor(program: Program, cause?: Error);
 }
-/** UnableToReposition: Unable to adjust position to the desired utilization rate */
-export declare class UnableToRepositionError extends ProgramError {
+/** UnableToRebalance: Unable to adjust position to the desired utilization rate */
+export declare class UnableToRebalanceError extends ProgramError {
     readonly name: string;
     readonly code: number;
     constructor(program: Program, cause?: Error);

package/dist/generated/errors/solauto.d.ts.map

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

package/dist/generated/errors/solauto.js

@@ -7,7 +7,7 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IncorrectInstructionsError = exports.RebalanceAbuseError = exports.InstructionIsCPIError = exports.InvalidRebalanceConditionError = exports.ExceededValidUtilizationRateError = exports.UnableToRepositionError = exports.StaleProtocolDataError = exports.InvalidAutomationDataError = exports.InvalidDCASettingsError = exports.InvalidPositionSettingsError = exports.FailedAccountDeserializationError = exports.IncorrectAccountsError = void 0;
+exports.IncorrectInstructionsError = exports.RebalanceAbuseError = exports.InstructionIsCPIError = exports.InvalidRebalanceConditionError = exports.ExceededValidUtilizationRateError = exports.UnableToRebalanceError = exports.StaleProtocolDataError = exports.InvalidAutomationDataError = exports.InvalidDCASettingsError = exports.InvalidPositionSettingsError = exports.FailedAccountDeserializationError = exports.IncorrectAccountsError = void 0;
 exports.getSolautoErrorFromCode = getSolautoErrorFromCode;
 exports.getSolautoErrorFromName = getSolautoErrorFromName;
 const umi_1 = require("@metaplex-foundation/umi");
@@ -79,17 +79,17 @@ class StaleProtocolDataError extends umi_1.ProgramError {
 exports.StaleProtocolDataError = StaleProtocolDataError;
 codeToErrorMap.set(0x5, StaleProtocolDataError);
 nameToErrorMap.set('StaleProtocolData', StaleProtocolDataError);
-/** UnableToReposition: Unable to adjust position to the desired utilization rate */
-class UnableToRepositionError extends umi_1.ProgramError {
+/** UnableToRebalance: Unable to adjust position to the desired utilization rate */
+class UnableToRebalanceError extends umi_1.ProgramError {
     constructor(program, cause) {
         super('Unable to adjust position to the desired utilization rate', program, cause);
-        this.name = 'UnableToReposition';
+        this.name = 'UnableToRebalance';
         this.code = 0x6; // 6
     }
 }
-exports.UnableToRepositionError = UnableToRepositionError;
-codeToErrorMap.set(0x6, UnableToRepositionError);
-nameToErrorMap.set('UnableToReposition', UnableToRepositionError);
+exports.UnableToRebalanceError = UnableToRebalanceError;
+codeToErrorMap.set(0x6, UnableToRebalanceError);
+nameToErrorMap.set('UnableToRebalance', UnableToRebalanceError);
 /** ExceededValidUtilizationRate: Desired action brought the utilization rate to an unsafe amount */
 class ExceededValidUtilizationRateError extends umi_1.ProgramError {
     constructor(program, cause) {

package/dist/marginfi-sdk/types/oracleSetup.d.ts

@@ -9,8 +9,9 @@ import { Serializer } from '@metaplex-foundation/umi/serializers';
 export declare enum OracleSetup {
     None = 0,
     PythLegacy = 1,
-    SwitchboardV2 = 2,
-    PythPushOracle = 3
+    SwitchboardLegacy = 2,
+    PythPushOracle = 3,
+    SwitchboardPull = 4
 }
 export type OracleSetupArgs = OracleSetup;
 export declare function getOracleSetupSerializer(): Serializer<OracleSetupArgs, OracleSetup>;

package/dist/marginfi-sdk/types/oracleSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracleSetup.d.ts","sourceRoot":"","sources":["../../../src/marginfi-sdk/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,aAAa,IAAA;IACb,cAAc,IAAA;CACf;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/marginfi-sdk/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;CAChB;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;AAE1C,wBAAgB,wBAAwB,IAAI,UAAU,CACpD,eAAe,EACf,WAAW,CACZ,CAIA"}

package/dist/marginfi-sdk/types/oracleSetup.js

@@ -14,8 +14,9 @@ var OracleSetup;
 (function (OracleSetup) {
     OracleSetup[OracleSetup["None"] = 0] = "None";
     OracleSetup[OracleSetup["PythLegacy"] = 1] = "PythLegacy";
-    OracleSetup[OracleSetup["SwitchboardV2"] = 2] = "SwitchboardV2";
+    OracleSetup[OracleSetup["SwitchboardLegacy"] = 2] = "SwitchboardLegacy";
     OracleSetup[OracleSetup["PythPushOracle"] = 3] = "PythPushOracle";
+    OracleSetup[OracleSetup["SwitchboardPull"] = 4] = "SwitchboardPull";
 })(OracleSetup || (exports.OracleSetup = OracleSetup = {}));
 function getOracleSetupSerializer() {
     return (0, serializers_1.scalarEnum)(OracleSetup, {

package/dist/marginfi-sdk/types/wrappedI80F48.d.ts

@@ -5,7 +5,7 @@
  *
  * @see https://github.com/metaplex-foundation/kinobi
  */
-import { Serializer } from '@metaplex-foundation/umi/serializers';
+import { Serializer } from "@metaplex-foundation/umi/serializers";
 export type WrappedI80F48 = {
     value: number[];
 };

package/dist/marginfi-sdk/types/wrappedI80F48.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrappedI80F48.d.ts","sourceRoot":"","sources":["../../../src/marginfi-sdk/types/wrappedI80F48.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAqB,MAAM,sCAAsC,CAAC;AAErF,MAAM,MAAM,aAAa,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEpD,wBAAgB,0BAA0B,IAAI,UAAU,CACtD,iBAAiB,EACjB,aAAa,CACd,CAIA"}
+{"version":3,"file":"wrappedI80F48.d.ts","sourceRoot":"","sources":["../../../src/marginfi-sdk/types/wrappedI80F48.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAE9C,MAAM,MAAM,aAAa,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEpD,wBAAgB,0BAA0B,IAAI,UAAU,CACtD,iBAAiB,EACjB,aAAa,CACd,CAIA"}

package/dist/marginfi-sdk/types/wrappedI80F48.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWrappedI80F48Serializer = getWrappedI80F48Serializer;
 const serializers_1 = require("@metaplex-foundation/umi/serializers");
 function getWrappedI80F48Serializer() {
-    return (0, serializers_1.struct)([['value', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 16 })]], {
-        description: 'WrappedI80F48',
+    return (0, serializers_1.struct)([["value", (0, serializers_1.array)((0, serializers_1.u8)(), { size: 16 })]], {
+        description: "WrappedI80F48",
     });
 }

package/dist/types/accounts.d.ts

@@ -1,5 +1,4 @@
 export interface MarginfiAssetAccounts {
-    mint: string;
     bank: string;
     liquidityVault: string;
     vaultAuthority: string;

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

@@ -1 +1 @@
-{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/types/accounts.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB"}
+{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/types/accounts.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB"}

package/dist/utils/marginfiUtils.d.ts

@@ -4,10 +4,7 @@ import { Bank } from "../marginfi-sdk";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState } from "../generated";
 import { LivePositionUpdates } from "./solauto/generalUtils";
-export declare function findMarginfiAccounts({ mint, bank, }: {
-    mint?: string;
-    bank?: string;
-}): MarginfiAssetAccounts;
+export declare function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts;
 export declare function getMaxLtvAndLiqThreshold(umi: Umi, supply: {
     mint: PublicKey;
     bank?: Bank | null;

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,EACnC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,qBAAqB,CAWxB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,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,CA8D3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,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,CA6CA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA+IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAU3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,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,CA2D3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,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,CA6CA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA+IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}

package/dist/utils/marginfiUtils.js

@@ -15,28 +15,22 @@ const solautoConstants_1 = require("../constants/solautoConstants");
 const marginfiAccounts_1 = require("../constants/marginfiAccounts");
 const generalAccounts_1 = require("../constants/generalAccounts");
 const solanaUtils_1 = require("./solanaUtils");
-function findMarginfiAccounts({ mint, bank, }) {
+function findMarginfiAccounts(bank) {
     for (const key in marginfiAccounts_1.MARGINFI_ACCOUNTS) {
         const account = marginfiAccounts_1.MARGINFI_ACCOUNTS[key];
-        if (mint && account.mint.toString().toLowerCase() === mint.toLowerCase()) {
-            return account;
-        }
-        if (bank && account.bank.toString().toLowerCase() === bank.toLowerCase()) {
+        if (account.bank.toString().toLowerCase() === bank.toString().toLowerCase()) {
             return account;
         }
     }
-    throw new Error(`Marginfi accounts not found by the mint: ${mint}`);
+    throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
 async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
     if (!supply.bank || supply.bank === null) {
-        supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({
-            mint: supply.mint.toString(),
-        }).bank));
+        supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[supply.mint.toString()].bank));
     }
-    if ((!debt.bank || debt.bank === null) && !debt.mint.equals(web3_js_1.PublicKey.default)) {
-        debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({
-            mint: debt.mint.toString(),
-        }).bank));
+    if ((!debt.bank || debt.bank === null) &&
+        !debt.mint.equals(web3_js_1.PublicKey.default)) {
+        debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[debt.mint.toString()].bank));
     }
     if (!supplyPrice) {
         const [price] = await (0, generalUtils_1.getTokenPrices)([
@@ -141,10 +135,10 @@ async function getTokenUsage(umi, bank, isAsset, shares, amountUsedAdjustment) {
 async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMint, debtMint, livePositionUpdates) {
     let marginfiAccount = await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(marginfiAccountPk));
     let supplyBank = supplyMint && supplyMint !== web3_js_1.PublicKey.default
-        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({ mint: supplyMint.toString() }).bank))
+        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[supplyMint.toString()].bank))
         : null;
     let debtBank = debtMint && debtMint !== web3_js_1.PublicKey.default
-        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({ mint: debtMint.toString() }).bank))
+        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[debtMint.toString()].bank))
         : null;
     let supplyUsage = undefined;
     let debtUsage = undefined;

package/dist/utils/solauto/generalUtils.js

@@ -235,8 +235,8 @@ async function positionStateWithLatestPrices(state, supplyPrice, debtPrice) {
     };
 }
 function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
-    const supplyDecimals = constants_1.TOKEN_DECIMALS[supply.mint.toString()];
-    const debtDecimals = constants_1.TOKEN_DECIMALS[debt.mint.toString()];
+    const supplyDecimals = constants_1.TOKEN_INFO[supply.mint.toString()].decimals;
+    const debtDecimals = constants_1.TOKEN_INFO[debt.mint.toString()].decimals;
     const supplyUsd = supply.amountUsed * supply.price;
     const debtUsd = debt.amountUsed * debt.price;
     return {

package/local/updateMarginfiLUT.ts

@@ -14,7 +14,7 @@ async function addBanks() {
     const accounts = MARGINFI_ACCOUNTS[key];
     await updateLookupTable(
       [
-        accounts.mint,
+        key,
         accounts.bank,
         accounts.liquidityVault,
         accounts.vaultAuthority,

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -16,6 +16,7 @@ import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import {
   DEFAULT_MARGINFI_GROUP,
+  MARGINFI_ACCOUNTS,
   MARGINFI_ACCOUNTS_LOOKUP_TABLE,
 } from "../constants/marginfiAccounts";
 import {
@@ -33,6 +34,7 @@ import {
 import { getMarginfiAccountPDA, getTokenAccount } from "../utils/accountUtils";
 import { generateRandomU64 } from "../utils/generalUtils";
 import {
+  Bank,
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
   lendingAccountBorrow,
@@ -42,7 +44,9 @@ import {
   lendingAccountStartFlashloan,
   lendingAccountWithdraw,
   marginfiAccountInitialize,
+  safeFetchAllBank,
   safeFetchAllMarginfiAccount,
+  safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
 import { JupSwapDetails } from "../utils/jupiterUtils";
@@ -74,6 +78,9 @@ export class SolautoMarginfiClient extends SolautoClient {
   public marginfiSupplyAccounts!: MarginfiAssetAccounts;
   public marginfiDebtAccounts!: MarginfiAssetAccounts;
 
+  public supplyPriceOracle!: PublicKey;
+  public debtPriceOracle!: PublicKey;
+
   // For flash loans
   public intermediaryMarginfiAccountSigner?: Signer;
   public intermediaryMarginfiAccountPk!: PublicKey;
@@ -108,12 +115,20 @@ export class SolautoMarginfiClient extends SolautoClient {
       ? toWeb3JsPublicKey(marginfiAccountData.group)
       : args.marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP);
 
-    this.marginfiSupplyAccounts = findMarginfiAccounts({
-      mint: this.supplyMint.toString(),
-    })!;
-    this.marginfiDebtAccounts = findMarginfiAccounts({
-      mint: this.debtMint.toString(),
-    })!;
+    this.marginfiSupplyAccounts =
+      MARGINFI_ACCOUNTS[this.supplyMint.toString()]!;
+    this.marginfiDebtAccounts = MARGINFI_ACCOUNTS[this.debtMint.toString()]!;
+
+    // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
+    // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
+    //   publicKey(this.marginfiSupplyAccounts.bank),
+    //   publicKey(this.marginfiDebtAccounts.bank),
+    // ]);
+    // this.supplyPriceOracle = toWeb3JsPublicKey(supplyBank.config.oracleKeys[0]);
+    // this.debtPriceOracle = toWeb3JsPublicKey(debtBank.config.oracleKeys[0]);
+
+    this.supplyPriceOracle = new PublicKey(this.marginfiSupplyAccounts.priceOracle);
+    this.debtPriceOracle = new PublicKey(this.marginfiDebtAccounts.priceOracle);
 
     if (!this.initialized) {
       await this.setIntermediaryMarginfiDetails();
@@ -171,7 +186,9 @@ export class SolautoMarginfiClient extends SolautoClient {
     return [
       ...super.lutAccountsToAdd(),
       this.marginfiAccountPk,
-      ...(this.signer.publicKey.toString() === this.authority.toString() ? [this.intermediaryMarginfiAccountPk] : []),
+      ...(this.signer.publicKey.toString() === this.authority.toString()
+        ? [this.intermediaryMarginfiAccountPk]
+        : []),
     ];
   }
 
@@ -246,9 +263,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccount),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
-      supplyPriceOracle: publicKey(this.marginfiSupplyAccounts.priceOracle),
+      supplyPriceOracle: publicKey(this.supplyPriceOracle),
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
-      debtPriceOracle: publicKey(this.marginfiDebtAccounts.priceOracle),
+      debtPriceOracle: publicKey(this.debtPriceOracle),
       solautoPosition: publicKey(this.solautoPosition),
     });
   }
@@ -358,18 +375,14 @@ export class SolautoMarginfiClient extends SolautoClient {
           : this.positionDebtTa
       );
       vaultDebtTa = publicKey(this.marginfiDebtAccounts.liquidityVault);
-      debtVaultAuthority = publicKey(
-        this.marginfiDebtAccounts.vaultAuthority
-      );
+      debtVaultAuthority = publicKey(this.marginfiDebtAccounts.vaultAuthority);
     }
 
     let supplyPriceOracle: UmiPublicKey | undefined = undefined;
     let debtPriceOracle: UmiPublicKey | undefined = undefined;
     if (args.__kind === "Withdraw" || args.__kind === "Borrow") {
-      supplyPriceOracle = publicKey(
-        this.marginfiSupplyAccounts.priceOracle
-      );
-      debtPriceOracle = publicKey(this.marginfiDebtAccounts.priceOracle);
+      supplyPriceOracle = publicKey(this.supplyPriceOracle);
+      debtPriceOracle = publicKey(this.debtPriceOracle);
     }
 
     return marginfiProtocolInteraction(this.umi, {
@@ -431,7 +444,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         )
       ),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
-      supplyPriceOracle: publicKey(this.marginfiSupplyAccounts.priceOracle),
+      supplyPriceOracle: publicKey(this.supplyPriceOracle),
       positionSupplyTa: publicKey(this.positionSupplyTa),
       signerSupplyTa: this.selfManaged
         ? publicKey(this.signerSupplyTa)
@@ -443,7 +456,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         ? publicKey(this.marginfiSupplyAccounts.vaultAuthority)
         : undefined,
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
-      debtPriceOracle: publicKey(this.marginfiDebtAccounts.priceOracle),
+      debtPriceOracle: publicKey(this.debtPriceOracle),
       positionDebtTa: publicKey(this.positionDebtTa),
       signerDebtTa: this.selfManaged ? publicKey(this.signerDebtTa) : undefined,
       vaultDebtTa: needDebtAccounts
@@ -489,20 +502,25 @@ export class SolautoMarginfiClient extends SolautoClient {
   }
 
   flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder {
-    const bank = flashLoanDetails.mint.equals(this.supplyMint)
-      ? this.marginfiSupplyAccounts
-      : this.marginfiDebtAccounts;
+    const accounts = flashLoanDetails.mint.equals(this.supplyMint)
+      ? { data: this.marginfiSupplyAccounts, oracle: this.supplyPriceOracle }
+      : { data: this.marginfiDebtAccounts, oracle: this.debtPriceOracle };
 
     const remainingAccounts: AccountMeta[] = [];
     let includedFlashLoanToken = false;
 
     if (this.intermediaryMarginfiAccount) {
-      this.intermediaryMarginfiAccount.lendingAccount.balances.forEach((x) => {
+      this.intermediaryMarginfiAccount.lendingAccount.balances.forEach(async (x) => {
         if (x.active) {
-          if (x.bankPk === bank.bank) {
+          if (x.bankPk === accounts.data.bank) {
             includedFlashLoanToken = true;
           }
 
+          // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
+          // const bankData = await safeFetchBank(this.umi, publicKey(accounts.data.bank));
+          // const priceOracle = bankData!.config.oracleKeys[0];
+          const priceOracle = publicKey(findMarginfiAccounts(toWeb3JsPublicKey(x.bankPk)).priceOracle);
+
           remainingAccounts.push(
             ...[
               {
@@ -511,10 +529,7 @@ export class SolautoMarginfiClient extends SolautoClient {
                 isWritable: false,
               },
               {
-                pubkey: publicKey(
-                  findMarginfiAccounts({ bank: x.bankPk.toString() })
-                    .priceOracle
-                ),
+                pubkey: priceOracle,
                 isSigner: false,
                 isWritable: false,
               },
@@ -527,12 +542,12 @@ export class SolautoMarginfiClient extends SolautoClient {
       remainingAccounts.push(
         ...[
           {
-            pubkey: fromWeb3JsPublicKey(new PublicKey(bank.bank)),
+            pubkey: fromWeb3JsPublicKey(new PublicKey(accounts.data.bank)),
             isSigner: false,
             isWritable: false,
           },
           {
-            pubkey: fromWeb3JsPublicKey(new PublicKey(bank.priceOracle)),
+            pubkey: fromWeb3JsPublicKey(new PublicKey(accounts.oracle)),
             isSigner: false,
             isWritable: false,
           },
@@ -545,8 +560,8 @@ export class SolautoMarginfiClient extends SolautoClient {
         lendingAccountRepay(this.umi, {
           amount: flashLoanDetails.baseUnitAmount,
           repayAll: null,
-          bank: publicKey(bank.bank),
-          bankLiquidityVault: publicKey(bank.liquidityVault),
+          bank: publicKey(accounts.data.bank),
+          bankLiquidityVault: publicKey(accounts.data.liquidityVault),
           marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
           marginfiGroup: publicKey(DEFAULT_MARGINFI_GROUP),
           signer: this.signer,

package/src/constants/marginfiAccounts.ts

@@ -1,23 +1,33 @@
 import { NATIVE_MINT } from "@solana/spl-token";
-import { USDC_MINT } from "./tokenConstants";
+import { B_SOL, JUP, USDC_MINT } from "./tokenConstants";
 import { MarginfiAssetAccounts } from "../types/accounts";
 
 export const DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 
 export const MARGINFI_ACCOUNTS: { [key: string]: MarginfiAssetAccounts } = {
-  SOL: {
-    mint: NATIVE_MINT.toString(),
+  [NATIVE_MINT.toString()]: {
     bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
     liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
     vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
     priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE"
   },
-  USDC: {
-    mint: USDC_MINT,
+  [USDC_MINT]: {
     bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
     liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
     vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
     priceOracle: "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX"
+  },
+  [B_SOL]: {
+    bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
+    liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
+    vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
+    priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
+  },
+  [JUP]: {
+    bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
+    liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
+    vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
+    priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
   }
 };
 

package/src/constants/pythConstants.ts

@@ -1,5 +1,5 @@
 import { NATIVE_MINT } from "@solana/spl-token";
-import { USDC_MINT } from "./tokenConstants";
+import { B_SOL, JUP, USDC_MINT } from "./tokenConstants";
 
 // https://pyth.network/developers/price-feed-ids#solana-stable
 export const PYTH_PRICE_FEED_IDS = {
@@ -7,4 +7,6 @@ export const PYTH_PRICE_FEED_IDS = {
     "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
   [USDC_MINT]:
     "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
-};
+  [B_SOL]: "0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c",
+  [JUP]: "0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996",
+};

package/src/constants/tokenConstants.ts

@@ -1,19 +1,37 @@
 import { NATIVE_MINT } from "@solana/spl-token";
 
-// When adding token ensure a price feed is provided in pythConstants.ts & the token is added to the necessary lists below
+// When adding token ensure a price feed is provided in pythConstants.ts & the token is in TOKEN_INFO
 export const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+export const B_SOL = "bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1";
+export const JUP = "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN";
 
 
 export const ALL_SUPPORTED_TOKENS = [
     NATIVE_MINT.toString(),
     USDC_MINT,
+    B_SOL,
+    JUP,
 ];
 
-export const TOKEN_DECIMALS = {
-    [NATIVE_MINT.toString()]: 9,
-    [USDC_MINT]: 6
-};
+interface TokenInfo {
+    decimals: number;
+    isStableCoin?: boolean;
+    isLST?: boolean;
+}
 
-export const STABLECOINS = [
-    USDC_MINT
-];
+export const TOKEN_INFO: { [key: string]: TokenInfo } = {
+    [NATIVE_MINT.toString()]: {
+        decimals: 9,
+    },
+    [USDC_MINT]: {
+        decimals: 6,
+        isStableCoin: true
+    },
+    [B_SOL]: {
+        decimals: 9,
+        isLST: true
+    },
+    [JUP]: {
+        decimals: 6
+    }
+};

package/src/generated/errors/solauto.ts

@@ -108,9 +108,9 @@ export class StaleProtocolDataError extends ProgramError {
 codeToErrorMap.set(0x5, StaleProtocolDataError);
 nameToErrorMap.set('StaleProtocolData', StaleProtocolDataError);
 
-/** UnableToReposition: Unable to adjust position to the desired utilization rate */
-export class UnableToRepositionError extends ProgramError {
-  override readonly name: string = 'UnableToReposition';
+/** UnableToRebalance: Unable to adjust position to the desired utilization rate */
+export class UnableToRebalanceError extends ProgramError {
+  override readonly name: string = 'UnableToRebalance';
 
   readonly code: number = 0x6; // 6
 
@@ -122,8 +122,8 @@ export class UnableToRepositionError extends ProgramError {
     );
   }
 }
-codeToErrorMap.set(0x6, UnableToRepositionError);
-nameToErrorMap.set('UnableToReposition', UnableToRepositionError);
+codeToErrorMap.set(0x6, UnableToRebalanceError);
+nameToErrorMap.set('UnableToRebalance', UnableToRebalanceError);
 
 /** ExceededValidUtilizationRate: Desired action brought the utilization rate to an unsafe amount */
 export class ExceededValidUtilizationRateError extends ProgramError {

package/src/marginfi-sdk/types/oracleSetup.ts

@@ -11,8 +11,9 @@ import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
 export enum OracleSetup {
   None,
   PythLegacy,
-  SwitchboardV2,
+  SwitchboardLegacy,
   PythPushOracle,
+  SwitchboardPull,
 }
 
 export type OracleSetupArgs = OracleSetup;

package/src/marginfi-sdk/types/wrappedI80F48.ts

@@ -6,7 +6,12 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 
-import { Serializer, array, struct, u8 } from '@metaplex-foundation/umi/serializers';
+import {
+  Serializer,
+  array,
+  struct,
+  u8,
+} from "@metaplex-foundation/umi/serializers";
 
 export type WrappedI80F48 = { value: number[] };
 
@@ -16,7 +21,7 @@ export function getWrappedI80F48Serializer(): Serializer<
   WrappedI80F48Args,
   WrappedI80F48
 > {
-  return struct<WrappedI80F48>([['value', array(u8(), { size: 16 })]], {
-    description: 'WrappedI80F48',
+  return struct<WrappedI80F48>([["value", array(u8(), { size: 16 })]], {
+    description: "WrappedI80F48",
   }) as Serializer<WrappedI80F48Args, WrappedI80F48>;
 }

package/src/types/accounts.ts

@@ -1,5 +1,4 @@
 export interface MarginfiAssetAccounts {
-  mint: string;
   bank: string;
   liquidityVault: string;
   vaultAuthority: string;

package/src/utils/marginfiUtils.ts

@@ -23,23 +23,16 @@ import { USD_DECIMALS } from "../constants/generalAccounts";
 import { LivePositionUpdates } from "./solauto/generalUtils";
 import { currentUnixSecondsSolana } from "./solanaUtils";
 
-export function findMarginfiAccounts({
-  mint,
-  bank,
-}: {
-  mint?: string;
-  bank?: string;
-}): MarginfiAssetAccounts {
+export function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts {
   for (const key in MARGINFI_ACCOUNTS) {
     const account = MARGINFI_ACCOUNTS[key];
-    if (mint && account.mint.toString().toLowerCase() === mint.toLowerCase()) {
-      return account;
-    }
-    if (bank && account.bank.toString().toLowerCase() === bank.toLowerCase()) {
+    if (
+      account.bank.toString().toLowerCase() === bank.toString().toLowerCase()
+    ) {
       return account;
     }
   }
-  throw new Error(`Marginfi accounts not found by the mint: ${mint}`);
+  throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
 
 export async function getMaxLtvAndLiqThreshold(
@@ -57,21 +50,18 @@ export async function getMaxLtvAndLiqThreshold(
   if (!supply.bank || supply.bank === null) {
     supply.bank = await safeFetchBank(
       umi,
-      publicKey(
-        findMarginfiAccounts({
-          mint: supply.mint.toString(),
-        }).bank
-      )
+      publicKey(MARGINFI_ACCOUNTS[supply.mint.toString()].bank)
     );
   }
 
-  if ((!debt.bank || debt.bank === null) && !debt.mint.equals(PublicKey.default)) {
+  if (
+    (!debt.bank || debt.bank === null) &&
+    !debt.mint.equals(PublicKey.default)
+  ) {
     debt.bank = await safeFetchBank(
       umi,
       publicKey(
-        findMarginfiAccounts({
-          mint: debt.mint.toString(),
-        }).bank
+        MARGINFI_ACCOUNTS[debt.mint.toString()].bank
       )
     );
   }
@@ -248,14 +238,14 @@ export async function getMarginfiAccountPositionState(
     supplyMint && supplyMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(findMarginfiAccounts({ mint: supplyMint.toString() }).bank)
+          publicKey(MARGINFI_ACCOUNTS[supplyMint.toString()].bank)
         )
       : null;
   let debtBank: Bank | null =
     debtMint && debtMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(findMarginfiAccounts({ mint: debtMint.toString() }).bank)
+          publicKey(MARGINFI_ACCOUNTS[debtMint.toString()].bank)
         )
       : null;
 

package/src/utils/solauto/generalUtils.ts

@@ -23,7 +23,7 @@ import { getReferralState } from "../accountUtils";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   ALL_SUPPORTED_TOKENS,
-  TOKEN_DECIMALS,
+  TOKEN_INFO,
   USD_DECIMALS,
 } from "../../constants";
 import {
@@ -368,8 +368,8 @@ export function createFakePositionState(
   maxLtvBps: number,
   liqThresholdBps: number
 ): PositionState {
-  const supplyDecimals = TOKEN_DECIMALS[supply.mint.toString()];
-  const debtDecimals = TOKEN_DECIMALS[debt.mint.toString()];
+  const supplyDecimals = TOKEN_INFO[supply.mint.toString()].decimals;
+  const debtDecimals = TOKEN_INFO[debt.mint.toString()].decimals;
 
   const supplyUsd = supply.amountUsed * supply.price;
   const debtUsd = debt.amountUsed * debt.price;

package/tests/transactions/solautoMarginfi.ts

@@ -20,8 +20,8 @@ import { PublicKey } from "@solana/web3.js";
 import { USDC_MINT } from "../../src/constants";
 
 describe("Solauto Marginfi tests", async () => {
-  const signer = setupTest();
-  // const signer = setupTest("solauto-manager");
+  // const signer = setupTest();
+  const signer = setupTest("solauto-manager");
 
   const payForTransactions = false;
   const useJitoBundle = false;