@haven-fi/solauto-sdk 1.0.493 → 1.0.495

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,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAcjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA4I9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;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,GACnC,eAAe,CA6EjB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe;;;EAsDxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAgC9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA2DhB"}
+{"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,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAcjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA4I9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;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,GACnC,eAAe,CA6EjB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe;;;EAsDxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAgC9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAqEhB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -183,20 +183,23 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
     const usdToSwap = Math.abs(values.debtAdjustmentUsd) +
         (values.dcaTokenType === generated_1.TokenType.Debt ? values.amountUsdToDcaIn : 0);
     const inputAmount = (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, priceUtils_1.safeGetPrice)(input.mint), input.decimals);
+    const highLiquidity = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState?.netWorth.baseAmountUsdValue ?? BigInt(0), generalAccounts_1.USD_DECIMALS) > 10000;
+    const usingMajor = (0, generalUtils_2.tokenInfo)(client.supplyMint).isMajor || (0, generalUtils_2.tokenInfo)(client.debtMint).isMajor;
+    const debtPadding = !usingMajor && highLiquidity ? 0.001 : 0.0001;
     const outputAmount = targetLiqUtilizationRateBps === 0
         ? output.amountUsed.baseUnit +
             BigInt(Math.round(Number(output.amountUsed.baseUnit) *
                 // Add this small percentage to account for the APR on the debt between now and the transaction
-                0.0001))
+                debtPadding))
         : (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, priceUtils_1.safeGetPrice)(output.mint), output.decimals);
     const repaying = values.rebalanceDirection === generated_1.RebalanceDirection.Repay;
     const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(client, values);
     const flashLoanRepayFromDebt = repaying && requiresFlashLoan && useDebtLiquidity;
-    const exactOut = targetLiqUtilizationRateBps === 0 ||
+    const exactOut = (targetLiqUtilizationRateBps === 0 && highLiquidity && usingMajor) ||
         // values.repayingCloseToMaxLtv ||
         flashLoanRepayFromDebt;
     const exactIn = !exactOut;
-    const addPadding = exactOut;
+    const addPadding = exactOut || targetLiqUtilizationRateBps === 0;
     return {
         inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),

package/package.json

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

package/src/utils/solauto/rebalanceUtils.ts

@@ -16,7 +16,7 @@ import {
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { QuoteResponse } from "@jup-ag/api";
 import { JupSwapDetails } from "../jupiterUtils";
-import { consoleLog, currentUnixSeconds } from "../generalUtils";
+import { consoleLog, currentUnixSeconds, tokenInfo } from "../generalUtils";
 import {
   fromBaseUnit,
   fromBps,
@@ -393,6 +393,15 @@ export function getJupSwapRebalanceDetails(
     usdToSwap / safeGetPrice(input.mint)!,
     input.decimals
   );
+
+  const highLiquidity =
+    fromBaseUnit(
+      client.solautoPositionState?.netWorth.baseAmountUsdValue ?? BigInt(0),
+      USD_DECIMALS
+    ) > 10_000;
+  const usingMajor =
+    tokenInfo(client.supplyMint).isMajor || tokenInfo(client.debtMint).isMajor;
+  const debtPadding = !usingMajor && highLiquidity ? 0.001 : 0.0001;
   const outputAmount =
     targetLiqUtilizationRateBps === 0
       ? output.amountUsed.baseUnit +
@@ -400,7 +409,7 @@ export function getJupSwapRebalanceDetails(
           Math.round(
             Number(output.amountUsed.baseUnit) *
               // Add this small percentage to account for the APR on the debt between now and the transaction
-              0.0001
+              debtPadding
           )
         )
       : toBaseUnit(usdToSwap / safeGetPrice(output.mint)!, output.decimals);
@@ -414,13 +423,14 @@ export function getJupSwapRebalanceDetails(
   const flashLoanRepayFromDebt =
     repaying && requiresFlashLoan && useDebtLiquidity;
 
+
   const exactOut =
-    targetLiqUtilizationRateBps === 0 ||
+    (targetLiqUtilizationRateBps === 0 && highLiquidity && usingMajor) ||
     // values.repayingCloseToMaxLtv ||
     flashLoanRepayFromDebt;
   const exactIn = !exactOut;
 
-  const addPadding = exactOut;
+  const addPadding = exactOut || targetLiqUtilizationRateBps === 0;
 
   return {
     inputMint: toWeb3JsPublicKey(input.mint),

package/tests/transactions/solautoMarginfi.ts

@@ -45,7 +45,7 @@ describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest();
   const signer = setupTest("solauto-manager");
 
-  const payForTransactions = true;
+  const payForTransactions = false;
   const testProgram = false;
   const positionId = 1;
 
@@ -63,7 +63,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("5FALSVLRjuRZHSmQVdT2RUZC6KadCuDmxY7gaQFWFBxf"),
+      authority: new PublicKey("9j53Z6bejUaAxJCEC64BbxozLPuvsuAFsr6iqWKKDvaw"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""
@@ -152,48 +152,48 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    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, settingParams.boostToBps, attemptNum),
+    //       await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
     //     "rebalance"
     //   )
     // );
 
     // transactionItems.push(
     //   new TransactionItem(
-    //     async () => ({
-    //       tx: client.protocolInteraction(
-    //         solautoAction("Withdraw", [{ __kind: "All" }])
-    //       ),
-    //     }),
-    //     "withdraw"
+    //     async () => ({ tx: client.refresh() }),
+    //     "refresh"
     //   )
     // );
 
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async () => ({
-    //       tx: client.closePositionIx(),
-    //     }),
-    //     "close position"
-    //   )
-    // );
+    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,