@haven-fi/solauto-sdk 1.0.303 → 1.0.305

package/tests/transactions/solautoMarginfi.ts

@@ -8,13 +8,14 @@ import {
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
 import {
+  getLiqUtilzationRateBps,
   maxBoostToBps,
   maxRepayFromBps,
   maxRepayToBps,
   toBaseUnit,
 } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
-import { consoleLog, fetchTokenPrices } from "../../src/utils/generalUtils";
+import { consoleLog } from "../../src/utils/generalUtils";
 import {
   TransactionItem,
   TransactionsManager,
@@ -32,7 +33,7 @@ describe("Solauto Marginfi tests", async () => {
   const signer = setupTest();
   // const signer = setupTest("solauto-manager");
 
-  const payForTransactions = false;
+  const payForTransactions = true;
   const testProgram = true;
   const positionId = 3;
 
@@ -55,42 +56,48 @@ describe("Solauto Marginfi tests", async () => {
       // marginfiAccount: new PublicKey(
       //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
       // ),
-      marginfiGroup: new PublicKey("G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"),
-      supplyMint: new PublicKey("3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump"),
-      debtMint: new PublicKey(USDC),
+      // marginfiGroup: new PublicKey("G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"),
+      // supplyMint: new PublicKey("3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump"),
+      // debtMint: new PublicKey(USDC),
     });
 
     const transactionItems: TransactionItem[] = [];
     const settingParams: SolautoSettingsParametersInpArgs = {
-      boostToBps: 6900,
+      boostToBps: maxBoostToBps(
+        client.solautoPositionState?.maxLtvBps ?? 0,
+        client.solautoPositionState?.liqThresholdBps ?? 0
+      ),
       boostGap: 50,
-      repayToBps: 7000,
+      repayToBps: maxRepayToBps(
+        client.solautoPositionState?.maxLtvBps ?? 0,
+        client.solautoPositionState?.liqThresholdBps ?? 0
+      ),
       repayGap: 50,
       automation: none(),
       targetBoostToBps: none(),
     };
 
-    if (client.solautoPositionData === null) {
-      transactionItems.push(
-        new TransactionItem(async () => {
-          return {
-            tx: client.openPosition(settingParams),
-          };
-        }, "open position")
-      );
+    // 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(client.connection, [supply]);
-          return {
-            tx: client.protocolInteraction(
-              solautoAction("Deposit", [toBaseUnit(200, supplyDecimals)])
-            ),
-          };
-        }, "deposit")
-      );
-    }
+    // 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;
@@ -104,10 +111,6 @@ describe("Solauto Marginfi tests", async () => {
     //         positionId: client.positionId,
     //         settingParams: some({
     //           ...settingParams,
-    //           boostToBps: maxBoostTo,
-    //           boostGap: 50,
-    //           repayToBps: maxRepayTo,
-    //           repayGap: maxRepayFrom - maxRepayTo
     //         }),
     //         dca: null,
     //       }),
@@ -119,7 +122,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+          await buildSolautoRebalanceTransaction(client, 3000, attemptNum),
         "rebalance"
       )
     );
@@ -160,6 +163,5 @@ describe("Solauto Marginfi tests", async () => {
     ).clientSend(transactionItems);
 
     console.log(statuses);
-
   });
 });

package/tests/unit/rebalanceCalculations.ts

@@ -31,13 +31,14 @@ import {
   getUpdatedValueFromAutomation,
   positionStateWithLatestPrices,
 } from "../../src/utils/solauto/generalUtils";
+import { currentUnixSeconds } from "../../src/utils/generalUtils";
+import { USDC } from "../../src/constants/tokenConstants";
 import {
-  currentUnixSeconds,
+  buildHeliusApiUrl,
   fetchTokenPrices,
+  getSolanaRpcConnection,
   safeGetPrice,
-} from "../../src/utils/generalUtils";
-import { USDC } from "../../src/constants/tokenConstants";
-import { buildHeliusApiUrl, getSolanaRpcConnection } from "../../src/utils";
+} from "../../src/utils";
 
 const signer = setupTest(undefined, true);
 const [conn, _] = getSolanaRpcConnection(
@@ -126,7 +127,6 @@ async function getFakePosition(
   const maxLtvBps = 6400;
   const liqThresholdBps = 8181;
   client.solautoPositionState = await positionStateWithLatestPrices(
-    conn,
     createFakePositionState(
       {
         amountUsed: supplyUsd / supplyPrice,
@@ -287,7 +287,7 @@ describe("Rebalance tests", async () => {
   let supplyPrice: number, debtPrice: number;
 
   before(async () => {
-    [supplyPrice, debtPrice] = await fetchTokenPrices(conn, [
+    [supplyPrice, debtPrice] = await fetchTokenPrices([
       NATIVE_MINT,
       new PublicKey(USDC),
     ]);

package/local/createSolautoManagerAccount.ts

@@ -1,48 +0,0 @@
-import {
-  createSignerFromKeypair,
-  publicKey,
-  signerIdentity,
-  transactionBuilder,
-} from "@metaplex-foundation/umi";
-import {
-  buildHeliusApiUrl,
-  getSolanaRpcConnection,
-  sendSingleOptimizedTransaction,
-} from "../src/utils/solanaUtils";
-import { marginfiAccountInitialize } from "../src/marginfi-sdk";
-import { DEFAULT_MARGINFI_GROUP } from "../src/constants";
-import { getSecretKey } from "./shared";
-import { updateSolautoLut } from "./updateSolautoLUT";
-
-async function create() {
-  let [connection, umi] = getSolanaRpcConnection(buildHeliusApiUrl(process.env.HELIUS_API_KEY!));
-
-  const secretKey = getSecretKey("solauto-manager");
-  const signerKeypair = umi.eddsa.createKeypairFromSecretKey(secretKey);
-  const signer = createSignerFromKeypair(umi, signerKeypair);
-
-  umi = umi.use(signerIdentity(signer));
-
-  const marginfiAccount = createSignerFromKeypair(
-    umi,
-    umi.eddsa.generateKeypair()
-  );
-  console.log(marginfiAccount.publicKey);
-
-  const tx = marginfiAccountInitialize(umi, {
-    marginfiAccount,
-    marginfiGroup: publicKey(DEFAULT_MARGINFI_GROUP),
-    authority: signer,
-    feePayer: signer,
-  });
-
-  await sendSingleOptimizedTransaction(
-    umi,
-    connection,
-    transactionBuilder().add(tx)
-  );
-
-  await updateSolautoLut([marginfiAccount.publicKey.toString()]);
-}
-
-create();