@haven-fi/solauto-sdk 1.0.753 → 1.0.755

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;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;YAsE5B,mBAAmB;IA4CjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAwEhC,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;YAsE5B,mBAAmB;IA4CjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAmEhC,aAAa;;;;;;CAWpB"}

package/dist/services/rebalance/rebalanceSwapManager.js

@@ -124,8 +124,7 @@ class RebalanceSwapManager {
         let { input, output, biasedOutputPrice, inputAmount } = this.swapDetails();
         let outputAmount = rebalanceToZero
             ? output.amountUsed.baseUnit +
-                BigInt(Math.round(Number(output.amountUsed.baseUnit) *
-                    ((0, utils_1.fromBps)(this.solautoFeeBps) + 0.0001)))
+                BigInt(Math.round(Number(output.amountUsed.baseUnit) * 0.0001))
             : (0, utils_1.toBaseUnit)(this.usdToSwap() / biasedOutputPrice, output.decimals);
         const flashLoanRepayFromDebt = !this.isBoost() &&
             this.flRequirements &&

package/dist/services/transactions/manager/transactionsManager.js

@@ -64,7 +64,7 @@ class TransactionsManager {
                 ]);
                 for (let j = i; j >= 0; j--) {
                     const tx = txItems[j];
-                    if ((await newSet.fitsWith(tx))) {
+                    if ((await newSet.fitsWith(tx)) && !tx.name?.includes("rebalance")) {
                         newSet.prepend(tx);
                         i--;
                     }

package/local/txSandbox.ts

@@ -1,9 +1,10 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   ClientTransactionsManager,
   consoleLog,
+  fetchSolautoPosition,
   getBatches,
   getClient,
   getPositionExBulk,
@@ -47,14 +48,14 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 2,
-    authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
+    positionId: 1,
+    authority: new PublicKey("HqpPtE5WbBh3xU9C1Tzz125iYDQyoyodvFCRpwHwQpNc"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
-  const transactionItems = [rebalance(client)];
+  const transactionItems = [rebalance(client, undefined, 150)];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,

package/package.json

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

@@ -209,12 +209,7 @@ export class RebalanceSwapManager {
 
     let outputAmount = rebalanceToZero
       ? output.amountUsed.baseUnit +
-        BigInt(
-          Math.round(
-            Number(output.amountUsed.baseUnit) *
-              (fromBps(this.solautoFeeBps) + 0.0001)
-          )
-        )
+        BigInt(Math.round(Number(output.amountUsed.baseUnit) * 0.0001))
       : toBaseUnit(this.usdToSwap() / biasedOutputPrice, output.decimals);
 
     const flashLoanRepayFromDebt =

package/src/services/transactions/manager/transactionsManager.ts

@@ -126,7 +126,7 @@ export class TransactionsManager<T extends TxHandler> {
         ]);
         for (let j = i; j >= 0; j--) {
           const tx = txItems[j];
-          if ((await newSet.fitsWith(tx))) {
+          if ((await newSet.fitsWith(tx)) && !tx.name?.includes("rebalance")) {
             newSet.prepend(tx);
             i--;
           } else {