@haven-fi/solauto-sdk 1.0.383 → 1.0.385

package/dist/constants/marginfiAccounts.js

@@ -190,19 +190,19 @@ exports.MARGINFI_ACCOUNTS = {
             priceOracle: USDC_PRICE_ORACLE,
         },
     },
-    ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
-        [tokens.HMTR]: {
-            bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
-            liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
-            vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
-            priceOracle: switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
-        },
-        [tokens.USDC]: {
-            bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
-            liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
-            vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
-            priceOracle: USDC_PRICE_ORACLE,
-        }
-    }
+    // ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
+    //   [tokens.HMTR]: {
+    //     bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
+    //     liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
+    //     vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
+    //     priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
+    //   },
+    //   [tokens.USDC]: {
+    //     bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
+    //     liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
+    //     vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
+    //     priceOracle: USDC_PRICE_ORACLE,
+    //   }
+    // }
 };
 exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";

package/dist/constants/tokenConstants.js

@@ -49,7 +49,7 @@ exports.ALL_SUPPORTED_TOKENS = [
     exports.POPCAT,
     exports.RETARDIO,
     exports.BILLY,
-    exports.HMTR,
+    // HMTR,
 ];
 exports.TOKEN_INFO = {
     [web3_js_1.PublicKey.default.toString()]: {
@@ -161,9 +161,9 @@ exports.TOKEN_INFO = {
         decimals: 6,
         isMeme: true,
     },
-    [exports.HMTR]: {
-        ticker: "HMTR",
-        decimals: 0,
-        isMeme: true,
-    },
+    // [HMTR]: {
+    //   ticker: "HMTR",
+    //   decimals: 0,
+    //   isMeme: true,
+    // },
 };

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

@@ -8,8 +8,10 @@
 import { Serializer } from '@metaplex-foundation/umi/serializers';
 export declare enum OracleSetup {
     None = 0,
-    PythEma = 1,
-    SwitchboardV2 = 2
+    PythLegacy = 1,
+    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,OAAO,IAAA;IACP,aAAa,IAAA;CACd;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

@@ -13,8 +13,10 @@ const serializers_1 = require("@metaplex-foundation/umi/serializers");
 var OracleSetup;
 (function (OracleSetup) {
     OracleSetup[OracleSetup["None"] = 0] = "None";
-    OracleSetup[OracleSetup["PythEma"] = 1] = "PythEma";
-    OracleSetup[OracleSetup["SwitchboardV2"] = 2] = "SwitchboardV2";
+    OracleSetup[OracleSetup["PythLegacy"] = 1] = "PythLegacy";
+    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/utils/jupiterUtils.d.ts

@@ -19,4 +19,7 @@ export interface JupSwapTransaction {
     swapIx: TransactionBuilder;
 }
 export declare function getJupSwapTransaction(signer: Signer, swapDetails: JupSwapDetails, attemptNum?: number): Promise<JupSwapTransaction>;
+export declare function getJupPriceData(mints: PublicKey[], extraInfo?: boolean): Promise<{
+    [key: string]: any;
+}>;
 //# sourceMappingURL=jupiterUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAsF7B"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAsF7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GAY5E"}

package/dist/utils/jupiterUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJupSwapTransaction = getJupSwapTransaction;
+exports.getJupPriceData = getJupPriceData;
 const umi_1 = require("@metaplex-foundation/umi");
 const web3_js_1 = require("@solana/web3.js");
 const solanaUtils_1 = require("./solanaUtils");
@@ -33,7 +34,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
             : swapDetails.exactIn
                 ? "ExactIn"
                 : undefined,
-        slippageBps: memecoinSwap ? 150 : 50,
+        slippageBps: memecoinSwap ? 500 : 50,
         maxAccounts: !swapDetails.exactOut ? 50 : undefined,
     }), 4, 200);
     const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
@@ -70,3 +71,11 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
         swapIx: (0, umi_1.transactionBuilder)().add((0, solanaUtils_1.getWrappedInstruction)(signer, createTransactionInstruction(instructions.swapInstruction))),
     };
 }
+async function getJupPriceData(mints, extraInfo) {
+    const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+        const res = (await fetch("https://api.jup.ag/price/v2?ids=" +
+            mints.map((x) => x.toString()).join(",") + (extraInfo ? "&showExtraInfo=true" : ""))).json();
+        return res;
+    }, 6);
+    return data.data;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAarE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CA6CnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAoBzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB"}
+{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAcrE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CA+CnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAYzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB"}

package/dist/utils/priceUtils.js

@@ -11,6 +11,7 @@ const solautoConstants_1 = require("../constants/solautoConstants");
 const switchboardConstants_1 = require("../constants/switchboardConstants");
 const generalUtils_1 = require("./generalUtils");
 const on_demand_1 = require("@switchboard-xyz/on-demand");
+const jupiterUtils_1 = require("./jupiterUtils");
 async function fetchTokenPrices(mints) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
     if (!mints.some((mint) => !(mint.toString() in solautoConstants_1.PRICES) ||
@@ -94,12 +95,8 @@ async function getJupTokenPrices(mints) {
     if (mints.length == 0) {
         return [];
     }
-    const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
-        const res = (await fetch("https://api.jup.ag/price/v2?ids=" +
-            mints.map((x) => x.toString()).join(","))).json();
-        return res;
-    }, 6);
-    const prices = Object.values(data.data).map((x) => parseFloat(x.price));
+    const data = await (0, jupiterUtils_1.getJupPriceData)(mints);
+    const prices = Object.values(data).map((x) => parseFloat(x.price));
     return prices;
 }
 function safeGetPrice(mint) {

package/package.json

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

package/src/constants/marginfiAccounts.ts

@@ -172,20 +172,20 @@ export const MARGINFI_ACCOUNTS: {
       priceOracle: USDC_PRICE_ORACLE,
     },
   },
-  ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
-    [tokens.HMTR]: {
-      bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
-      liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
-      vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
-      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
-    },
-    [tokens.USDC]: {
-      bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
-      liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
-      vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
-      priceOracle: USDC_PRICE_ORACLE,
-    }
-  }
+  // ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
+  //   [tokens.HMTR]: {
+  //     bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
+  //     liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
+  //     vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
+  //     priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
+  //   },
+  //   [tokens.USDC]: {
+  //     bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
+  //     liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
+  //     vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
+  //     priceOracle: USDC_PRICE_ORACLE,
+  //   }
+  // }
 };
 
 export const MARGINFI_ACCOUNTS_LOOKUP_TABLE =

package/src/constants/tokenConstants.ts

@@ -48,7 +48,7 @@ export const ALL_SUPPORTED_TOKENS = [
   POPCAT,
   RETARDIO,
   BILLY,
-  HMTR,
+  // HMTR,
 ];
 
 interface TokenInfo {
@@ -170,9 +170,9 @@ export const TOKEN_INFO: { [key: string]: TokenInfo } = {
     decimals: 6,
     isMeme: true,
   },
-  [HMTR]: {
-    ticker: "HMTR",
-    decimals: 0,
-    isMeme: true,
-  },
+  // [HMTR]: {
+  //   ticker: "HMTR",
+  //   decimals: 0,
+  //   isMeme: true,
+  // },
 };

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

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

package/src/utils/jupiterUtils.ts

@@ -70,7 +70,7 @@ export async function getJupSwapTransaction(
           : swapDetails.exactIn
             ? "ExactIn"
             : undefined,
-        slippageBps: memecoinSwap ? 150 : 50,
+        slippageBps: memecoinSwap ? 500 : 50,
         maxAccounts: !swapDetails.exactOut ? 50 : undefined,
       }),
     4,
@@ -140,4 +140,18 @@ export async function getJupSwapTransaction(
       )
     ),
   };
-}
+}
+
+export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean) {
+  const data = await retryWithExponentialBackoff(async () => {
+    const res = (
+      await fetch(
+        "https://api.jup.ag/price/v2?ids=" +
+          mints.map((x) => x.toString()).join(",") + (extraInfo ? "&showExtraInfo=true" : "")
+      )
+    ).json();
+    return res;
+  }, 6);
+
+  return data.data as { [key: string]: any };
+}

package/src/utils/priceUtils.ts

@@ -11,6 +11,7 @@ import {
   zip,
 } from "./generalUtils";
 import { CrossbarClient } from "@switchboard-xyz/on-demand";
+import { getJupPriceData } from "./jupiterUtils";
 
 export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
@@ -110,12 +111,12 @@ export async function getSwitchboardPrices(
           "mainnet",
           mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()])
         );
-  
+
         const p = res.flatMap((x) => x.results[0]);
         if (p.filter((x) => !x || isNaN(Number(x))).length > 0) {
           throw new Error("Unable to fetch Switchboard prices");
         }
-  
+
         return p;
       },
       2,
@@ -129,7 +130,9 @@ export async function getSwitchboardPrices(
     prices = Array(mints.length).fill(0);
   }
 
-  const missingPrices = zip(mints, prices).filter((x) => !x[1] || isNaN(Number(x)));
+  const missingPrices = zip(mints, prices).filter(
+    (x) => !x[1] || isNaN(Number(x))
+  );
   const jupPrices = zip(
     missingPrices.map((x) => x[0]),
     await getJupTokenPrices(missingPrices.map((x) => x[0]))
@@ -147,17 +150,9 @@ export async function getJupTokenPrices(mints: PublicKey[]) {
     return [];
   }
 
-  const data = await retryWithExponentialBackoff(async () => {
-    const res = (
-      await fetch(
-        "https://api.jup.ag/price/v2?ids=" +
-          mints.map((x) => x.toString()).join(",")
-      )
-    ).json();
-    return res;
-  }, 6);
-
-  const prices = Object.values(data.data as { [key: string]: any }).map(
+  const data = await getJupPriceData(mints);
+
+  const prices = Object.values(data).map(
     (x) => parseFloat(x.price as string) as number
   );
 

package/tests/transactions/solautoMarginfi.ts

@@ -10,10 +10,14 @@ import {
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
 import {
+  fromBaseUnit,
+  getDebtAdjustmentUsd,
+  getMaxLiqUtilizationRateBps,
   maxBoostToBps,
   maxRepayFromBps,
   maxRepayToBps,
   toBaseUnit,
+  toBps,
 } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
 import {
@@ -22,16 +26,38 @@ import {
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
 import {
+  B_SOL,
+  DEFAULT_MARGINFI_GROUP,
   HMTR,
+  JITO_SOL,
+  JLP,
+  POPCAT,
+  RETARDIO,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
+  USD_DECIMALS,
   USDC,
+  WETH,
 } from "../../src/constants";
-import { buildHeliusApiUrl, getAllPositionsByAuthority, getJupTokenPrices, getSolautoManagedPositions } from "../../src/utils";
+import { buildHeliusApiUrl, calcMarginfiMaxLtvAndLiqThreshold, fetchTokenPrices, getAllPositionsByAuthority, getJupPriceData, getJupTokenPrices, getMarginfiAccountPositionState, getSolautoManagedPositions, safeGetPrice } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
-import { buildIronforgeApiUrl, TransactionManagerStatuses } from "../../dist";
+import { buildIronforgeApiUrl, MARGINFI_ACCOUNTS, TransactionManagerStatuses } from "../../dist";
 import { connect } from "http2";
 import CommonClient from "rpc-websockets/dist/lib/client";
+import { safeFetchAllBank } from "../../src/marginfi-sdk";
+
+export function getLeverageFactor(
+  strategyType: "Long" | "Short",
+  supplyUsd: number,
+  debtUsd: number
+): number {
+  let levFactor =
+    (strategyType === 'Long' ? supplyUsd : debtUsd) / (supplyUsd - debtUsd);
+  if (strategyType === 'Short') {
+    levFactor += 1;
+  }
+  return levFactor;
+}
 
 describe("Solauto Marginfi tests", async () => {
   const signer = setupTest();
@@ -52,18 +78,57 @@ describe("Solauto Marginfi tests", async () => {
     const supplyDecimals = 6;
     const debtDecimals = 6;
 
-    await client.initialize({
-      signer,
-      positionId,
-      authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
-      // new: true,
-      // marginfiAccount: new PublicKey(
-      //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
-      // ),
-      // marginfiGroup: new PublicKey("G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"),
-      // supplyMint: new PublicKey("3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump"),
-      // debtMint: new PublicKey(USDC),
-    });
+    // await client.initialize({
+    //   signer,
+    //   positionId,
+    //   authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
+    //   // new: true,
+    //   // marginfiAccount: new PublicKey(
+    //   //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
+    //   // ),
+    //   // marginfiGroup: new PublicKey("G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"),
+    //   // supplyMint: new PublicKey("3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump"),
+    //   // debtMint: new PublicKey(USDC),
+    // });
+
+    // console.log(JSON.stringify(await getJupPriceData([new PublicKey("7JhmUcZrrfhyt5nTSu3AfsrUq2L9992a7AhwdSDxdoL2")], true), null, 2));
+    // console.log(JSON.stringify(await getJupPriceData([new PublicKey(POPCAT)], true), null, 2));
+
+    // const accounts = MARGINFI_ACCOUNTS["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"];
+    // const accounts = MARGINFI_ACCOUNTS[DEFAULT_MARGINFI_GROUP];
+    // const [supplyBank, debtBank] = await safeFetchAllBank(client.umi, [publicKey(accounts[USDC].bank), publicKey(accounts[tokenMint].bank)]);
+
+    // console.log(supplyBank, debtBank);
+    // const [maxLtv, liqThreshold] = calcMarginfiMaxLtvAndLiqThreshold(
+    //   supplyBank,
+    //   debtBank,
+    //   safeGetPrice(new PublicKey(USDC)) ?? 0
+    // );
+
+    // console.log(maxLtv, liqThreshold);
+
+    // const supplyUsd = 100;
+    // const debtAdjustmentUsd = getDebtAdjustmentUsd(
+    //   toBps(liqThreshold),
+    //   supplyUsd,
+    //   0,
+    //   maxBoostToBps(toBps(maxLtv), toBps(liqThreshold))
+    //   // getMaxLiqUtilizationRateBps(toBps(maxLtv), toBps(liqThreshold), 0.005)
+    // );
+    // const maxLeverage = getLeverageFactor(
+    //   "Short",
+    //   supplyUsd + debtAdjustmentUsd,
+    //   debtAdjustmentUsd
+    // );
+    // console.log(maxLeverage, supplyUsd + debtAdjustmentUsd, debtAdjustmentUsd);
+
+    // const state = await getMarginfiAccountPositionState(client.umi, { pk: new PublicKey("GSw9ewsUgmuzDRJGYvSzkPPZgXfDszuGx7y22zMWSQkS") });
+    // const stateKeverage = getLeverageFactor(
+    //   "Short",
+    //   fromBaseUnit(state.supply.amountUsed.baseAmountUsdValue, USD_DECIMALS),
+    //   fromBaseUnit(state.debt.amountUsed.baseAmountUsdValue, USD_DECIMALS)
+    // );
+    // console.log(stateKeverage);
 
     // console.log(await getJupTokenPrices([new PublicKey(HMTR)]));
 
@@ -220,19 +285,19 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    const temp = (statuses: TransactionManagerStatuses) =>
-      console.log(statuses);
+    // const temp = (statuses: TransactionManagerStatuses) =>
+    //   console.log(statuses);
 
-    const statuses = await new TransactionsManager(
-      client,
-      temp,
-      !payForTransactions ? "only-simulate" : "normal",
-      PriorityFeeSetting.Low,
-      true,
-      undefined,
-      0
-    ).clientSend(transactionItems);
+    // const statuses = await new TransactionsManager(
+    //   client,
+    //   temp,
+    //   !payForTransactions ? "only-simulate" : "normal",
+    //   PriorityFeeSetting.Low,
+    //   true,
+    //   undefined,
+    //   0
+    // ).clientSend(transactionItems);
 
-    console.log(statuses);
+    // console.log(statuses);
   });
 });