@haven-fi/solauto-sdk 1.0.736 → 1.0.737

package/dist/services/rebalance/rebalanceSwapManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAA0B,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAc3E,qBAAa,oBAAoB;IAS7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAZb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,aAAa,CAAU;gBAGrB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAU/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAsCnB,OAAO,CAAC,kCAAkC;YAwE5B,mBAAmB;IAyCjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}
+{"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAA0B,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAY3E,qBAAa,oBAAoB;IAS7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAZb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,aAAa,CAAU;gBAGrB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAU/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAsCnB,OAAO,CAAC,kCAAkC;YAwE5B,mBAAmB;IAyCjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}

package/dist/services/rebalance/rebalanceSwapManager.js

@@ -14,7 +14,7 @@ class RebalanceSwapManager {
         this.flRequirements = flRequirements;
         this.targetLiqUtilizationRateBps = targetLiqUtilizationRateBps;
         this.priceType = priceType;
-        this.jupSwapManager = new swap_1.JupSwapManager(client.signer);
+        this.jupSwapManager = new swap_1.JupSwapManager(client.signer, true);
         this.solautoFeeBps = solautoFees_1.SolautoFeesBps.create(this.client.isReferred, this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd(this.priceType)).getSolautoFeesBps(values.rebalanceDirection).total;
     }
     isBoost() {

package/dist/services/swap/jupSwapManager.d.ts

@@ -24,9 +24,10 @@ export interface JupSwapTransactionData {
 }
 export declare class JupSwapManager {
     private signer;
+    private limitSize?;
     jupApi: import("@jup-ag/api").DefaultApi;
     jupQuote: QuoteResponse | undefined;
-    constructor(signer: Signer);
+    constructor(signer: Signer, limitSize?: boolean | undefined);
     getQuote(data: SwapInput): Promise<QuoteResponse>;
     private getJupInstructions;
     priceImpactBps(): number;

package/dist/services/swap/jupSwapManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAWrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAM,WAAW,SAAS;IACxB,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;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAKb,OAAO,CAAC,MAAM;IAJ1B,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAEnC,MAAM,EAAE,MAAM;IAErB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YA6BhD,kBAAkB;IAsChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}
+{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAWrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAM,WAAW,SAAS;IACxB,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;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAMvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS,CAAC;IANpB,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAG7C,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,OAAO,YAAA;IAGhB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YA8BhD,kBAAkB;IAsChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}

package/dist/services/swap/jupSwapManager.js

@@ -6,8 +6,9 @@ const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters"
 const api_1 = require("@jup-ag/api");
 const utils_1 = require("../../utils");
 class JupSwapManager {
-    constructor(signer) {
+    constructor(signer, limitSize) {
         this.signer = signer;
+        this.limitSize = limitSize;
         this.jupApi = (0, api_1.createJupiterApiClient)();
         this.jupQuote = undefined;
     }
@@ -27,7 +28,7 @@ class JupSwapManager {
                     ? "ExactIn"
                     : undefined,
             slippageBps,
-            maxAccounts: !data.exactOut
+            maxAccounts: !data.exactOut && this.limitSize
                 ? (lowLiquidityMint ? 25 : 15) + attemptNum * 5
                 : undefined,
         }), 6, 250);

package/dist/utils/jitoUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAgBlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAiGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAwHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAwG/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAgBlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAiGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAsHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAyG/B"}

package/dist/utils/jitoUtils.js

@@ -103,11 +103,9 @@ function getAdditionalSigners(message) {
     return signersInfo;
 }
 async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigners, txs, sign, feeEstimates, computeUnitLimits) {
-    let builtTxs = await Promise.all(txs.map(async (tx, i) => {
-        return (0, solanaUtils_1.assembleFinalTransaction)(umi, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined)
-            .setBlockhash(blockhash)
-            .build(umi);
-    }));
+    let builtTxs = txs.map((tx, i) => (0, solanaUtils_1.assembleFinalTransaction)(umi, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined)
+        .setBlockhash(blockhash)
+        .build(umi));
     if (sign) {
         builtTxs = await userSigner.signAllTransactions(builtTxs);
         for (const signer of otherSigners) {
@@ -199,7 +197,7 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
     let builtTxs = [];
     let simulationResults;
     if (txType !== "skip-simulation") {
-        builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, false, undefined, Array(txs.length).map(_ => 1400000));
+        builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, false, undefined, Array(txs.length).map((_) => 1400000));
         simulationResults = await simulateJitoBundle(umi, builtTxs);
     }
     const feeEstimates = (0, services_1.usePriorityFee)(priorityFeeSetting)

package/local/txSandbox.ts

@@ -23,7 +23,7 @@ import {
 import { getSecretKey } from "./shared";
 
 const payForTransaction = false;
-const testProgram = false;
+const testProgram = true;
 const lpEnv: ProgramEnv = "Prod";
 
 let [, umi] = getSolanaRpcConnection(
@@ -47,14 +47,14 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 2,
-    authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
+    positionId: 5,
+    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
-  const transactionItems = [rebalance(client)];
+  const transactionItems = [rebalance(client, undefined, 600), rebalance(client, undefined, 600)];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,

package/package.json

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

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -6,12 +6,10 @@ import { JupSwapManager, SwapParams, SwapInput } from "../swap";
 import { applyDebtAdjustmentUsd, RebalanceValues } from "./rebalanceValues";
 import { PriceType, RebalanceDirection, TokenType } from "../../generated";
 import {
-  bytesToI80F48,
   consoleLog,
   fromBaseUnit,
   fromBps,
   getLiqUtilzationRateBps,
-  isMarginfiPosition,
   safeGetPrice,
   toBaseUnit,
   tokenInfo,
@@ -33,7 +31,7 @@ export class RebalanceSwapManager {
     private targetLiqUtilizationRateBps?: number,
     private priceType?: PriceType
   ) {
-    this.jupSwapManager = new JupSwapManager(client.signer);
+    this.jupSwapManager = new JupSwapManager(client.signer, true);
     this.solautoFeeBps = SolautoFeesBps.create(
       this.client.isReferred,
       this.targetLiqUtilizationRateBps,

package/src/services/swap/jupSwapManager.ts

@@ -51,7 +51,10 @@ export class JupSwapManager {
 
   public jupQuote: QuoteResponse | undefined = undefined;
 
-  constructor(private signer: Signer) {}
+  constructor(
+    private signer: Signer,
+    private limitSize?: boolean
+  ) {}
 
   public async getQuote(data: SwapInput): Promise<QuoteResponse> {
     const inputMintInfo: TokenInfo | undefined = tokenInfo(data.inputMint);
@@ -73,9 +76,10 @@ export class JupSwapManager {
               ? "ExactIn"
               : undefined,
           slippageBps,
-          maxAccounts: !data.exactOut
-            ? (lowLiquidityMint ? 25 : 15) + attemptNum * 5
-            : undefined,
+          maxAccounts:
+            !data.exactOut && this.limitSize
+              ? (lowLiquidityMint ? 25 : 15) + attemptNum * 5
+              : undefined,
         }),
       6,
       250

package/src/utils/jitoUtils.ts

@@ -160,17 +160,15 @@ async function umiToVersionedTransactions(
   feeEstimates?: number[],
   computeUnitLimits?: number[]
 ): Promise<VersionedTransaction[]> {
-  let builtTxs = await Promise.all(
-    txs.map(async (tx, i) => {
-      return assembleFinalTransaction(
-        umi,
-        tx,
-        feeEstimates ? feeEstimates[i] : undefined,
-        computeUnitLimits ? computeUnitLimits[i] : undefined
-      )
-        .setBlockhash(blockhash)
-        .build(umi);
-    })
+  let builtTxs = txs.map((tx, i) =>
+    assembleFinalTransaction(
+      umi,
+      tx,
+      feeEstimates ? feeEstimates[i] : undefined,
+      computeUnitLimits ? computeUnitLimits[i] : undefined
+    )
+      .setBlockhash(blockhash)
+      .build(umi)
   );
 
   if (sign) {
@@ -280,7 +278,7 @@ export async function sendJitoBundledTransactions(
   abortController?: AbortController
 ): Promise<string[] | undefined> {
   const txs = [...transactions];
-  
+
   if (txs.length === 1) {
     const resp = await sendSingleOptimizedTransaction(
       umi,
@@ -313,6 +311,7 @@ export async function sendJitoBundledTransactions(
   if (abortController?.signal.aborted) {
     return;
   }
+
   let builtTxs: VersionedTransaction[] = [];
   let simulationResults: SimulatedTransactionResponse[] | undefined;
   if (txType !== "skip-simulation") {
@@ -324,24 +323,24 @@ export async function sendJitoBundledTransactions(
       txs,
       false,
       undefined,
-      Array(txs.length).map(_ => 1_400_000)
+      Array(txs.length).map((_) => 1_400_000)
     );
     simulationResults = await simulateJitoBundle(umi, builtTxs);
   }
 
   const feeEstimates = usePriorityFee(priorityFeeSetting)
-  ? await Promise.all(
-      txs.map(
-        async (x) =>
-          (await getComputeUnitPriceEstimate(
-            umi,
-            x,
-            priorityFeeSetting,
-            true
-          )) ?? 1000000
+    ? await Promise.all(
+        txs.map(
+          async (x) =>
+            (await getComputeUnitPriceEstimate(
+              umi,
+              x,
+              priorityFeeSetting,
+              true
+            )) ?? 1000000
+        )
       )
-    )
-  : undefined;
+    : undefined;
 
   if (abortController?.signal.aborted) {
     return;