@haven-fi/solauto-sdk 1.0.582 → 1.0.583

package/tests/transactions/solautoMarginfi.ts

@@ -1,207 +1,17 @@
 import { describe, it } from "mocha";
-import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
-import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
-import {
-  PositionType,
-  safeFetchSolautoPosition,
-  solautoAction,
-  SolautoSettingsParametersInpArgs,
-} from "../../src/generated";
-import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
-import {
-  bytesToI80F48,
-  getLiqUtilzationRateBps,
-  getMaxLiqUtilizationRateBps,
-  maxBoostToBps,
-  maxRepayFromBps,
-  maxRepayToBps,
-  toBaseUnit,
-} from "../../src/utils/numberUtils";
-import { NATIVE_MINT } from "@solana/spl-token";
-import {
-  TransactionItem,
-  TransactionsManager,
-} from "../../src/transactions/transactionsManager";
-import { PublicKey } from "@solana/web3.js";
-import {
-  ALL_SUPPORTED_TOKENS,
-  DEFAULT_MARGINFI_GROUP,
-  MARGINFI_ACCOUNTS,
-  POPCAT,
-  PRICES,
-  SOLAUTO_PROD_PROGRAM,
-  SOLAUTO_TEST_PROGRAM,
-  USDC,
-  USDT,
-} from "../../src/constants";
-import {
-  buildHeliusApiUrl,
-  buildIronforgeApiUrl,
-  fetchTokenPrices,
-  getAllPositionsByAuthority,
-  getJupTokenPrices,
-  getQnComputeUnitPriceEstimate,
-  getSolautoManagedPositions,
-  getSolautoPositionAccount,
-  getSwitchboardPrices,
-  retryWithExponentialBackoff,
-} from "../../src/utils";
-import { PriorityFeeSetting } from "../../src/types";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../../src/constants/switchboardConstants";
+import { LendingPlatform } from "../../src";
+import { e2eTransactionTest } from "./shared";
 
 describe("Solauto Marginfi tests", async () => {
-  // const signer = setupTest();
-  const signer = setupTest("solauto-manager");
-
-  const payForTransactions = false;
-  const testProgram = false;
-  const positionId = 1;
+  const signer = setupTest();
+  const testProgram = true;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
-    const client = new SolautoMarginfiClient(
-      buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
-      true,
-      testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
-    );
-
-    const supply = NATIVE_MINT;
-    const supplyDecimals = 6;
-    const debtDecimals = 6;
-
-    await client.initialize({
-      signer,
-      positionId,
-      authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
-      // new: true,
-      // marginfiAccount: new PublicKey(
-      //   ""
-      // ),
-      // marginfiGroup: new PublicKey(""),
-      // supplyMint: new PublicKey(""),
-      // debtMint: new PublicKey(USDC),
-    });
-
-    const transactionItems: TransactionItem[] = [];
-    // const settingParams: SolautoSettingsParametersInpArgs = {
-    //   boostToBps: maxBoostToBps(
-    //     client.solautoPositionState?.maxLtvBps ?? 0,
-    //     client.solautoPositionState?.liqThresholdBps ?? 0
-    //   ),
-    //   boostGap: 50,
-    //   repayToBps: maxRepayToBps(
-    //     client.solautoPositionState?.maxLtvBps ?? 0,
-    //     client.solautoPositionState?.liqThresholdBps ?? 0
-    //   ),
-    //   repayGap: 50,
-    //   automation: none(),
-    //   targetBoostToBps: none(),
-    // };
-
-    const settingParams: SolautoSettingsParametersInpArgs = {
-      boostToBps: client.solautoPositionSettings().boostToBps - 150,
-      boostGap: 50,
-      repayToBps: client.solautoPositionSettings().repayToBps - 150,
-      repayGap: 50,
-      automation: none(),
-      targetBoostToBps: none(),
-    };
-
-    // if (client.solautoPositionData === null) {
-    //   transactionItems.push(
-    //     new TransactionItem(async () => {
-    //       return {
-    //         tx: client.openPosition(settingParams),
-    //       };
-    //     }, "open position")
-    //   );
-
-    // const initialSupplyUsd = 150;
-    // transactionItems.push(
-    //   new TransactionItem(async () => {
-    //     // const [supplyPrice] = await fetchTokenPrices([supply]);
-    //     return {
-    //       tx: client.protocolInteraction(
-    //         solautoAction("Deposit", [toBaseUnit(300, supplyDecimals)])
-    //       ),
-    //     };
-    //   }, "deposit")
-    // );
-    // }
-
-    // const maxLtvBps = client.solautoPositionState!.maxLtvBps;
-    // const liqThresholdBps = client.solautoPositionState!.liqThresholdBps;
-    // const maxRepayFrom = maxRepayFromBps(maxLtvBps, liqThresholdBps);
-    // const maxRepayTo = maxRepayToBps(maxLtvBps, liqThresholdBps);
-    // const maxBoostTo = maxBoostToBps(maxLtvBps, liqThresholdBps);
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async () => ({
-    //       tx: client.updatePositionIx({
-    //         positionId: client.positionId,
-    //         settingParams: some({
-    //           ...settingParams,
-    //         }),
-    //         dca: null,
-    //       }),
-    //     }),
-    //     "update position"
-    //   )
-    // );
-
-    transactionItems.push(
-      new TransactionItem(
-        async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
-        "rebalance"
-      )
-    );
-
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async () => ({ tx: client.refresh() }),
-    //     "refresh"
-    //   )
-    // );
-
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async (attemptNum) =>
-    //       await buildSolautoRebalanceTransaction(client, 0, attemptNum),
-    //     "rebalance"
-    //   )
-    // );
-
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async () => ({
-    //       tx: client.protocolInteraction(
-    //         solautoAction("Withdraw", [{ __kind: "All" }])
-    //       ),
-    //     }),
-    //     "withdraw"
-    //   )
-    // );
-
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async () => ({
-    //       tx: client.closePositionIx(),
-    //     }),
-    //     "close position"
-    //   )
-    // );
-
-    const statuses = await new TransactionsManager(
-      client,
-      undefined,
-      !payForTransactions ? "only-simulate" : "normal",
-      PriorityFeeSetting.Min,
-      true,
-      undefined,
-      { totalRetries: 5 }
-    ).clientSend(transactionItems);
+    await e2eTransactionTest(signer, testProgram, LendingPlatform.Marginfi, false);
+  });
 
-    console.log(statuses);
+  it("open - deposit - borrow - fl rebalance to 0 - withdraw - close", async () => {
+    await e2eTransactionTest(signer, testProgram, LendingPlatform.Marginfi, true);
   });
 });

package/tests/unit/accounts.ts

@@ -10,7 +10,7 @@ import {
 import { publicKey } from "@metaplex-foundation/umi";
 import { assert } from "chai";
 import {
-  getAllMarginfiAccountsByAuthority,
+  getEmptyMarginfiAccountsByAuthority,
   getTokenAccount,
 } from "../../src/utils";
 import {
@@ -19,7 +19,6 @@ import {
   SOLAUTO_MANAGER,
 } from "../../src/constants";
 import { PublicKey } from "@solana/web3.js";
-import { safeFetchAllMarginfiAccount } from "../../src/marginfi-sdk";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
 async function hasTokenAccounts(wallet: PublicKey) {
@@ -54,21 +53,15 @@ describe("Assert Solauto fee token accounts are created", async () => {
       buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
     );
 
-    const ismAccounts = await getAllMarginfiAccountsByAuthority(
+    const ismAccounts = await getEmptyMarginfiAccountsByAuthority(
       umi,
       SOLAUTO_MANAGER,
-      undefined,
-      false
-    );
-    const ismData = await safeFetchAllMarginfiAccount(
-      umi,
-      ismAccounts.map((x) => publicKey(x.marginfiAccount))
     );
     const supportedMarginfiGroups = Object.keys(MARGINFI_ACCOUNTS).map(
       (x) => new PublicKey(x)
     );
     const missingIsmAccounts = supportedMarginfiGroups.filter(
-      (group) => !ismData.find((x) => group.equals(toWeb3JsPublicKey(x.group)))
+      (group) => !ismAccounts.find((x) => group.equals(toWeb3JsPublicKey(x.group)))
     );
 
     console.log("Missing ISM accounts", missingIsmAccounts);

package/tests/unit/lookupTables.ts

@@ -1,11 +1,19 @@
 import { describe, it } from "mocha";
-import { clusterApiUrl, Connection, PublicKey } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 import {
   MARGINFI_ACCOUNTS,
   MARGINFI_ACCOUNTS_LOOKUP_TABLE,
 } from "../../src/constants/marginfiAccounts";
+import {
+  buildIronforgeApiUrl,
+  getEmptyMarginfiAccountsByAuthority,
+  getSolanaRpcConnection,
+  SOLAUTO_MANAGER,
+} from "../../src";
 
-const conn = new Connection(clusterApiUrl("mainnet-beta"), "confirmed");
+const [conn, umi] = getSolanaRpcConnection(
+  buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!)
+);
 
 describe("Assert lookup tables up-to-date", async () => {
   it("marginfi accounts LUT should have everything", async () => {
@@ -16,6 +24,11 @@ describe("Assert lookup tables up-to-date", async () => {
       throw new Error("Lookup table not found");
     }
 
+    const ismAccounts = await getEmptyMarginfiAccountsByAuthority(
+      umi,
+      SOLAUTO_MANAGER
+    );
+
     const existingAccounts =
       lookupTable.value?.state.addresses.map((x) => x.toString()) ?? [];
 
@@ -25,6 +38,13 @@ describe("Assert lookup tables up-to-date", async () => {
           continue;
         }
 
+        const groupIsmAccounts = ismAccounts
+          .filter((x) => x.group.toString() === group)
+          .map((x) => x.publicKey.toString());
+        if (groupIsmAccounts.length === 0) {
+          throw new Error(`Missing ISM account for group: ${group}`);
+        }
+
         const accounts = MARGINFI_ACCOUNTS[group][key];
         const addresses = [
           group,
@@ -32,6 +52,7 @@ describe("Assert lookup tables up-to-date", async () => {
           accounts.liquidityVault,
           accounts.vaultAuthority,
           accounts.priceOracle,
+          ...groupIsmAccounts,
         ];
 
         if (addresses.find((x) => !existingAccounts.includes(x.toString()))) {