@haven-fi/solauto-sdk 1.0.521 → 1.0.523

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;AAWrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAkC1D;AAED,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,CAmF7B;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;AAUrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAwB1D;AAED,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,CAmF7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}

package/dist/utils/jupiterUtils.js

@@ -10,7 +10,6 @@ const numberUtils_1 = require("./numberUtils");
 const api_1 = require("@jup-ag/api");
 const accountUtils_1 = require("./accountUtils");
 const generalUtils_1 = require("./generalUtils");
-const constants_1 = require("../constants");
 const jupApi = (0, api_1.createJupiterApiClient)();
 function createTransactionInstruction(instruction) {
     return new web3_js_1.TransactionInstruction({
@@ -26,10 +25,6 @@ function createTransactionInstruction(instruction) {
 async function getJupQuote(swapDetails) {
     const memecoinSwap = (0, generalUtils_1.tokenInfo)(swapDetails.inputMint).isMeme ||
         (0, generalUtils_1.tokenInfo)(swapDetails.outputMint).isMeme;
-    const tokensWithLowAccounts = [constants_1.PYTH, constants_1.INF];
-    // 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)));
     return await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
         amount: Number(swapDetails.amount),
         inputMint: swapDetails.inputMint.toString(),
@@ -41,7 +36,7 @@ async function getJupQuote(swapDetails) {
                 : undefined,
         slippageBps: memecoinSwap ? 500 : 200,
         maxAccounts: !swapDetails.exactOut
-            ? useLowAccounts ? 15 : 30
+            ? 15
             : undefined,
     }), 2, 200);
 }

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,EAAgB,MAAM,iBAAiB,CAAC;AAc5E,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAoI9C,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,CA4EjB;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,UAAU,CAAC,EAAE,MAAM,GAClB,qBAAqB,GAAG,SAAS,CA0EnC;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,qBAAqB,EACrC,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA2B9B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,EACtC,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,CA0FzB"}
+{"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,EAAgB,MAAM,iBAAiB,CAAC;AAc5E,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAoI9C,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,CA4EjB;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,UAAU,CAAC,EAAE,MAAM,GAClB,qBAAqB,GAAG,SAAS,CA0EnC;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,qBAAqB,EACrC,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA2B9B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,EACtC,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,CAqEzB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -219,26 +219,12 @@ async function getJupSwapRebalanceDetails(client, values, flRequirements, target
     (0, generalUtils_2.consoleLog)(jupSwapInput);
     let jupQuote = undefined;
     if (rebalanceToZero) {
-        try {
-            jupQuote = await (0, jupiterUtils_1.getJupQuote)(jupSwapInput);
-        }
-        catch {
-            let priceImpact = 0;
-            jupSwapInput.exactIn = true;
-            jupSwapInput.exactOut = false;
+        do {
             jupSwapInput.amount =
-                inputAmount + BigInt(Math.round(Number(inputAmount) * 0.001));
-            do {
-                const res = await (0, priceUtils_1.getPriceImpact)(jupSwapInput.inputMint, jupSwapInput.outputMint, jupSwapInput.amount +
-                    BigInt(Math.round(Number(jupSwapInput.amount) * priceImpact)), "ExactIn");
-                priceImpact = res.priceImpact;
-                jupQuote = res.quote;
-                jupSwapInput.amount =
-                    BigInt(parseInt(res.quote.inAmount)) +
-                        BigInt(Math.round(Number(jupSwapInput.amount) * 0.001));
-            } while (parseInt(jupQuote.outAmount) < outputAmount &&
-                priceImpact > 0.001);
-        }
+                jupSwapInput.amount +
+                    BigInt(Math.round(Number(jupSwapInput.amount) * 0.01));
+            jupQuote = await (0, jupiterUtils_1.getJupQuote)(jupSwapInput);
+        } while (parseInt(jupQuote.outAmount) < outputAmount);
     }
     const addPadding = exactOut;
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.521",
+  "version": "1.0.523",
   "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

@@ -17,7 +17,6 @@ import {
   retryWithExponentialBackoff,
   tokenInfo,
 } from "./generalUtils";
-import { INF, PYTH } from "../constants";
 
 const jupApi = createJupiterApiClient();
 
@@ -55,16 +54,6 @@ export async function getJupQuote(swapDetails: JupSwapInput) {
     tokenInfo(swapDetails.inputMint).isMeme ||
     tokenInfo(swapDetails.outputMint).isMeme;
 
-  const tokensWithLowAccounts = [PYTH, INF];
-  // TEMP REVERT ME
-  const useLowAccounts =
-    tokensWithLowAccounts.find((x) =>
-      swapDetails.inputMint.equals(new PublicKey(x))
-    ) ||
-    tokensWithLowAccounts.find((x) =>
-      swapDetails.outputMint.equals(new PublicKey(x))
-    );
-
   return await retryWithExponentialBackoff(
     async () =>
       await jupApi.quoteGet({
@@ -78,7 +67,7 @@ export async function getJupQuote(swapDetails: JupSwapInput) {
             : undefined,
         slippageBps: memecoinSwap ? 500 : 200,
         maxAccounts: !swapDetails.exactOut
-          ? useLowAccounts ? 15 : 30
+          ? 15
           : undefined,
       }),
     2,

package/src/utils/solauto/rebalanceUtils.ts

@@ -439,33 +439,12 @@ export async function getJupSwapRebalanceDetails(
 
   let jupQuote: QuoteResponse | undefined = undefined;
   if (rebalanceToZero) {
-    try {
-      jupQuote = await getJupQuote(jupSwapInput);
-    } catch {
-      let priceImpact: number = 0;
-      jupSwapInput.exactIn = true;
-      jupSwapInput.exactOut = false;
+    do {
       jupSwapInput.amount =
-        inputAmount + BigInt(Math.round(Number(inputAmount) * 0.001));
-
-      do {
-        const res = await getPriceImpact(
-          jupSwapInput.inputMint,
-          jupSwapInput.outputMint,
-          jupSwapInput.amount +
-            BigInt(Math.round(Number(jupSwapInput.amount) * priceImpact)),
-          "ExactIn"
-        );
-        priceImpact = res.priceImpact;
-        jupQuote = res.quote;
-        jupSwapInput.amount =
-          BigInt(parseInt(res.quote.inAmount)) +
-          BigInt(Math.round(Number(jupSwapInput.amount) * 0.001));
-      } while (
-        parseInt(jupQuote.outAmount) < outputAmount &&
-        priceImpact > 0.001
-      );
-    }
+        jupSwapInput.amount +
+        BigInt(Math.round(Number(jupSwapInput.amount) * 0.01));
+      jupQuote = await getJupQuote(jupSwapInput);
+    } while (parseInt(jupQuote.outAmount) < outputAmount);
   }
 
   const addPadding = exactOut;