@haven-fi/solauto-sdk 1.0.126 → 1.0.128

package/dist/transactions/transactionsManager.js

@@ -211,13 +211,13 @@ class TransactionsManager {
             choresBefore.prepend(updateLookupTable.updateLutTx);
         }
         if (choresBefore.getInstructions().length > 0) {
-            const chore = new TransactionItem(async () => ({ tx: choresBefore }), "create account(s)");
+            const chore = new TransactionItem(async () => ({ tx: choresBefore }));
             await chore.initialize();
             items.unshift(chore);
             this.txHandler.log("Chores before: ", choresBefore.getInstructions().length);
         }
         if (choresAfter.getInstructions().length > 0) {
-            const chore = new TransactionItem(async () => ({ tx: choresAfter }));
+            const chore = new TransactionItem(async () => ({ tx: choresAfter }), "closing temp accounts");
             await chore.initialize();
             items.push(chore);
             this.txHandler.log("Chores after: ", choresAfter.getInstructions().length);

package/dist/utils/numberUtils.js

@@ -69,9 +69,9 @@ function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtil
 function getSolautoFeesBps(isReferred, targetLiqUtilizationRateBps, positionNetWorthUsd) {
     const minSize = 10000; // Minimum position size
     const maxSize = 500000; // Maximum position size
-    const maxFeeBps = 500; // Fee in basis points for minSize (5%)
+    const maxFeeBps = 200; // Fee in basis points for minSize (2%)
     const minFeeBps = 50; // Fee in basis points for maxSize (0.5%)
-    const k = 0.55;
+    const k = 1.5;
     let feeBps = 0;
     if (targetLiqUtilizationRateBps !== undefined) {
         feeBps = minFeeBps;

package/dist/utils/solauto/rebalanceUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAkJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CA0EjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAoE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAkJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CA0EjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -131,15 +131,9 @@ function getFlashLoanDetails(client, values, jupQuote) {
             ? debtUsd + debtAdjustmentWithSlippage
             : debtUsd;
     const tempLiqUtilizationRateBps = (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, client.solautoPositionState.liqThresholdBps);
-    //TODO: revert me:
-    const requiresFlashLoan = true;
-    // supplyUsd <= 0 ||
-    // tempLiqUtilizationRateBps >
-    //   getMaxLiqUtilizationRateBps(
-    //     client.solautoPositionState!.maxLtvBps,
-    //     client.solautoPositionState!.liqThresholdBps,
-    //     0.01
-    //   );
+    const requiresFlashLoan = supplyUsd <= 0 ||
+        tempLiqUtilizationRateBps >
+            (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.01);
     let flashLoanToken = undefined;
     let flashLoanTokenPrice = 0;
     if (values.increasingLeverage) {

package/package.json

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

package/src/transactions/transactionsManager.ts

@@ -320,10 +320,7 @@ export class TransactionsManager {
       choresBefore.prepend(updateLookupTable.updateLutTx);
     }
     if (choresBefore.getInstructions().length > 0) {
-      const chore = new TransactionItem(
-        async () => ({ tx: choresBefore }),
-        "create account(s)"
-      );
+      const chore = new TransactionItem(async () => ({ tx: choresBefore }));
       await chore.initialize();
       items.unshift(chore);
       this.txHandler.log(
@@ -332,7 +329,10 @@ export class TransactionsManager {
       );
     }
     if (choresAfter.getInstructions().length > 0) {
-      const chore = new TransactionItem(async () => ({ tx: choresAfter }));
+      const chore = new TransactionItem(
+        async () => ({ tx: choresAfter }),
+        "closing temp accounts"
+      );
       await chore.initialize();
       items.push(chore);
       this.txHandler.log(

package/src/utils/numberUtils.ts

@@ -97,9 +97,9 @@ export function getSolautoFeesBps(
 } {
   const minSize = 10_000; // Minimum position size
   const maxSize = 500_000; // Maximum position size
-  const maxFeeBps = 500; // Fee in basis points for minSize (5%)
+  const maxFeeBps = 200; // Fee in basis points for minSize (2%)
   const minFeeBps = 50; // Fee in basis points for maxSize (0.5%)
-  const k = 0.55;
+  const k = 1.5;
 
   let feeBps: number = 0;
 

package/src/utils/solauto/rebalanceUtils.ts

@@ -287,15 +287,14 @@ export function getFlashLoanDetails(
     debtUsd,
     client.solautoPositionState!.liqThresholdBps
   );
-  //TODO: revert me:
-  const requiresFlashLoan = true;
-    // supplyUsd <= 0 ||
-    // tempLiqUtilizationRateBps >
-    //   getMaxLiqUtilizationRateBps(
-    //     client.solautoPositionState!.maxLtvBps,
-    //     client.solautoPositionState!.liqThresholdBps,
-    //     0.01
-    //   );
+  const requiresFlashLoan =
+    supplyUsd <= 0 ||
+    tempLiqUtilizationRateBps >
+      getMaxLiqUtilizationRateBps(
+        client.solautoPositionState!.maxLtvBps,
+        client.solautoPositionState!.liqThresholdBps,
+        0.01
+      );
 
   let flashLoanToken: PositionTokenUsage | undefined = undefined;
   let flashLoanTokenPrice = 0;

package/tests/transactions/solautoMarginfi.ts

@@ -1,20 +1,15 @@
 import { describe, it } from "mocha";
 import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
-import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
+import {
+  SolautoMarginfiClient,
+} from "../../src/clients/solautoMarginfiClient";
 import {
   solautoAction,
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
-import {
-  getDebtAdjustmentUsd,
-  getLiqUtilzationRateBps,
-  maxBoostToBps,
-  maxRepayFromBps,
-  maxRepayToBps,
-  toBaseUnit,
-} from "../../src/utils/numberUtils";
+import { maxBoostToBps, maxRepayFromBps, maxRepayToBps, toBaseUnit } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { getTokenPrices } from "../../src/utils/generalUtils";
 import {
@@ -33,22 +28,25 @@ describe("Solauto Marginfi tests", async () => {
   const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
+
     const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY!, true);
 
     const supply = NATIVE_MINT;
     const supplyDecimals = 9;
     const debtDecimals = 6;
 
-    await client.initialize({
-      signer,
-      positionId,
-      authority: new PublicKey("E5BBsR1sUToPc3jXVwhrK5ttSiy6xhWJDMdQLvkgNppe")
-      // marginfiAccount: new PublicKey(
-      //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
-      // ),
-      // supplyMint: NATIVE_MINT,
-      // debtMint: new PublicKey(USDC_MINT),
-    });
+    await client.initialize(
+      {
+        signer,
+        positionId,
+        authority: new PublicKey("AprYCPiVeKMCgjQ2ZufwChMzvQ5kFjJo2ekTLSkXsQDm")
+        // marginfiAccount: new PublicKey(
+        //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
+        // ),
+        // supplyMint: NATIVE_MINT,
+        // debtMint: new PublicKey(USDC_MINT),
+      }
+    );
 
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {
@@ -122,13 +120,13 @@ describe("Solauto Marginfi tests", async () => {
     //   }, "deposit")
     // );
 
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async (attemptNum) =>
-    //       await buildSolautoRebalanceTransaction(client, 1500, attemptNum),
-    //     "rebalance"
-    //   )
-    // );
+    transactionItems.push(
+      new TransactionItem(
+        async (attemptNum) =>
+          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+        "rebalance"
+      )
+    );
 
     // transactionItems.push(
     //   new TransactionItem(
@@ -157,19 +155,11 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    // await new TransactionsManager(
-    //   client,
-    //   undefined,
-    //   !payForTransactions ? "only-simulate" : "normal",
-    //   useJitoBundle
-    // ).clientSend(transactionItems);
-
-    // const debtAdjustment = getDebtAdjustmentUsd(8696, 366, 165, 7000);
-    // const newLiqUtilizationRate = getLiqUtilzationRateBps(366 + debtAdjustment, 165 + debtAdjustment, 8696);
-    // console.log(newLiqUtilizationRate);
-
-    console.log("CURRENT", Number(client.solautoPositionState?.supply.amountUsed.baseUnit));
-    const freshState = await client.getFreshPositionState();
-    console.log("FRESH", Number(freshState!.supply.amountUsed.baseUnit));
+    await new TransactionsManager(
+      client,
+      undefined,
+      !payForTransactions ? "only-simulate" : "normal",
+      useJitoBundle
+    ).clientSend(transactionItems);
   });
 });