@haven-fi/solauto-sdk 1.0.499 → 1.0.501

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;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;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,CAoH7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}
+{"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;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;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,CAiI7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}

package/dist/utils/jupiterUtils.js

@@ -29,22 +29,32 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
     // TEMP REVERT ME
     const useLowAccounts = tokensWithLowAccounts.find((x) => swapDetails.inputMint.equals(new web3_js_1.PublicKey(x))) ||
         tokensWithLowAccounts.find((x) => swapDetails.outputMint.equals(new web3_js_1.PublicKey(x)));
-    const quoteResponse = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
-        amount: Number(swapDetails.amount),
-        inputMint: swapDetails.inputMint.toString(),
-        outputMint: swapDetails.outputMint.toString(),
-        swapMode: swapDetails.exactOut
-            ? "ExactOut"
-            : swapDetails.exactIn
-                ? "ExactIn"
+    let quoteResponse;
+    try {
+        quoteResponse = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
+            amount: Number(swapDetails.amount),
+            inputMint: swapDetails.inputMint.toString(),
+            outputMint: swapDetails.outputMint.toString(),
+            swapMode: swapDetails.exactOut
+                ? "ExactOut"
+                : swapDetails.exactIn
+                    ? "ExactIn"
+                    : undefined,
+            slippageBps: memecoinSwap ? 500 : 200,
+            maxAccounts: !swapDetails.exactOut
+                ? useLowAccounts
+                    ? 15
+                    : 40
                 : undefined,
-        slippageBps: memecoinSwap ? 500 : 200,
-        maxAccounts: !swapDetails.exactOut
-            ? useLowAccounts
-                ? 15
-                : 40
-            : undefined,
-    }), 4, 200);
+        }), 4, 200);
+    }
+    catch (e) {
+        if (swapDetails.exactOut) {
+            // Failed to find exact out route, try exact in
+            return await getJupSwapTransaction(signer, { ...swapDetails, exactIn: true }, attemptNum);
+        }
+        throw e;
+    }
     const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
     const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
         (1 + (swapDetails.slippageIncFactor ?? 0)));

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,CA4EhB"}
+{"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"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -183,20 +183,6 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
     const usdToSwap = Math.abs(values.debtAdjustmentUsd) +
         (values.dcaTokenType === generated_1.TokenType.Debt ? values.amountUsdToDcaIn : 0);
     let inputAmount = (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, priceUtils_1.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 inputPadding = targetLiqUtilizationRateBps === 0
-        // && !usingMajor && highLiquidity
-        ? 0.1
-        : 0;
-    if (inputPadding) {
-        inputAmount += BigInt(Math.round(Number(inputAmount) * inputPadding));
-    }
     const outputAmount = targetLiqUtilizationRateBps === 0
         ? output.amountUsed.baseUnit +
             BigInt(Math.round(Number(output.amountUsed.baseUnit) *
@@ -206,10 +192,8 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
     const repaying = values.rebalanceDirection === generated_1.RebalanceDirection.Repay;
     const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(client, values);
     const flashLoanRepayFromDebt = repaying && requiresFlashLoan && useDebtLiquidity;
-    const exactOut = 
-    // (targetLiqUtilizationRateBps === 0 && !highLiquidity && usingMajor) ||
-    // values.repayingCloseToMaxLtv ||
-    flashLoanRepayFromDebt;
+    const exactOut = targetLiqUtilizationRateBps === 0 ||
+        flashLoanRepayFromDebt;
     const exactIn = !exactOut;
     const addPadding = exactOut;
     return {

package/package.json

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

package/src/utils/jupiterUtils.ts

@@ -70,27 +70,40 @@ export async function getJupSwapTransaction(
       swapDetails.outputMint.equals(new PublicKey(x))
     );
 
-  const quoteResponse = await retryWithExponentialBackoff(
-    async () =>
-      await jupApi.quoteGet({
-        amount: Number(swapDetails.amount),
-        inputMint: swapDetails.inputMint.toString(),
-        outputMint: swapDetails.outputMint.toString(),
-        swapMode: swapDetails.exactOut
-          ? "ExactOut"
-          : swapDetails.exactIn
-            ? "ExactIn"
+  let quoteResponse: QuoteResponse;
+  try {
+    quoteResponse = await retryWithExponentialBackoff(
+      async () =>
+        await jupApi.quoteGet({
+          amount: Number(swapDetails.amount),
+          inputMint: swapDetails.inputMint.toString(),
+          outputMint: swapDetails.outputMint.toString(),
+          swapMode: swapDetails.exactOut
+            ? "ExactOut"
+            : swapDetails.exactIn
+              ? "ExactIn"
+              : undefined,
+          slippageBps: memecoinSwap ? 500 : 200,
+          maxAccounts: !swapDetails.exactOut
+            ? useLowAccounts
+              ? 15
+              : 40
             : undefined,
-        slippageBps: memecoinSwap ? 500 : 200,
-        maxAccounts: !swapDetails.exactOut
-          ? useLowAccounts
-            ? 15
-            : 40
-          : undefined,
-      }),
-    4,
-    200
-  );
+        }),
+      4,
+      200
+    );
+  } catch (e) {
+    if (swapDetails.exactOut) {
+      // Failed to find exact out route, try exact in
+      return await getJupSwapTransaction(
+        signer,
+        { ...swapDetails, exactIn: true },
+        attemptNum
+      );
+    }
+    throw e;
+  }
 
   const priceImpactBps =
     Math.round(toBps(parseFloat(quoteResponse.priceImpactPct))) + 1;

package/src/utils/solauto/rebalanceUtils.ts

@@ -394,22 +394,6 @@ export function getJupSwapRebalanceDetails(
     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 inputPadding =
-    targetLiqUtilizationRateBps === 0
-    // && !usingMajor && highLiquidity
-      ? 0.1
-      : 0;
-  if (inputPadding) {
-    inputAmount += BigInt(Math.round(Number(inputAmount) * inputPadding));
-  }
-
   const outputAmount =
     targetLiqUtilizationRateBps === 0
       ? output.amountUsed.baseUnit +
@@ -432,8 +416,7 @@ export function getJupSwapRebalanceDetails(
     repaying && requiresFlashLoan && useDebtLiquidity;
 
   const exactOut =
-    // (targetLiqUtilizationRateBps === 0 && !highLiquidity && usingMajor) ||
-    // values.repayingCloseToMaxLtv ||
+    targetLiqUtilizationRateBps === 0 ||
     flashLoanRepayFromDebt;
   const exactIn = !exactOut;
 

package/tests/transactions/solautoMarginfi.ts

@@ -3,6 +3,7 @@ import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
+  PositionType,
   safeFetchSolautoPosition,
   solautoAction,
   SolautoSettingsParametersInpArgs,
@@ -33,8 +34,10 @@ import {
 } from "../../src/constants";
 import {
   buildHeliusApiUrl,
+  getAllPositionsByAuthority,
   getQnComputeUnitPriceEstimate,
   getSolautoManagedPositions,
+  getSolautoPositionAccount,
   retryWithExponentialBackoff,
 } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
@@ -60,6 +63,13 @@ describe("Solauto Marginfi tests", async () => {
     const supplyDecimals = 6;
     const debtDecimals = 6;
 
+    console.log(
+      getSolautoPositionAccount(
+        new PublicKey("9j53Z6bejUaAxJCEC64BbxozLPuvsuAFsr6iqWKKDvaw"),
+        1,
+        SOLAUTO_PROD_PROGRAM
+      )
+    );
     await client.initialize({
       signer,
       positionId,
@@ -73,6 +83,8 @@ describe("Solauto Marginfi tests", async () => {
       // debtMint: new PublicKey(USDC),
     });
 
+    return;
+
     // console.log(
     //   JSON.stringify(
     //     await getQnComputeUnitPriceEstimate(