@haven-fi/solauto-sdk 1.0.174 → 1.0.175

package/dist/transactions/transactionUtils.d.ts

@@ -4,6 +4,7 @@ import { ReferralState } from "../generated";
 import { SolautoClient } from "../clients/solautoClient";
 export declare function rebalanceChoresBefore(client: SolautoClient, tx: TransactionBuilder, accountsGettingCreated: string[]): Promise<TransactionBuilder>;
 export declare function getTransactionChores(client: SolautoClient, tx: TransactionBuilder): Promise<[TransactionBuilder, TransactionBuilder]>;
+export declare function requiresRefreshBeforeRebalance(client: SolautoClient): boolean;
 export declare function buildSolautoRebalanceTransaction(client: SolautoClient, targetLiqUtilizationRateBps?: number, attemptNum?: number): Promise<{
     tx: TransactionBuilder;
     lookupTableAddresses: string[];

package/dist/transactions/transactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAEL,aAAa,EAUd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAyNzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAmLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAoIA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAEL,aAAa,EAUd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAyNzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAmLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,aAAa,WAyBnE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAwHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD"}

package/dist/transactions/transactionUtils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rebalanceChoresBefore = rebalanceChoresBefore;
 exports.getTransactionChores = getTransactionChores;
+exports.requiresRefreshBeforeRebalance = requiresRefreshBeforeRebalance;
 exports.buildSolautoRebalanceTransaction = buildSolautoRebalanceTransaction;
 exports.convertReferralFeesToDestination = convertReferralFeesToDestination;
 const umi_1 = require("@metaplex-foundation/umi");
@@ -322,6 +323,23 @@ async function getTransactionChores(client, tx) {
     choresAfter = choresAfter.add(transactionChoresAfter(client, solautoActions, client.livePositionUpdates.cancellingDca));
     return [choresBefore, choresAfter];
 }
+function requiresRefreshBeforeRebalance(client) {
+    if (client.solautoPositionState.liqUtilizationRateBps >
+        (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.01)) {
+        return true;
+    }
+    else if (client.solautoPositionData && !client.selfManaged) {
+        const oldSupply = client.solautoPositionData.state.supply.amountUsed.baseUnit;
+        const oldDebt = client.solautoPositionData.state.debt.amountUsed.baseUnit;
+        const supplyDiff = (client.solautoPositionState?.supply.amountUsed.baseUnit ?? BigInt(0)) - oldSupply;
+        const debtDiff = (client.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) - oldDebt;
+        if (Math.abs(Number(supplyDiff)) / Number(oldSupply) >= 0.01 || Math.abs(Number(debtDiff)) / Number(oldDebt) >= 0.01) {
+            return true;
+        }
+    }
+    // Rebalance ix will already refresh internally if position is self managed, has automation to update, or position state last updated >= 1 day ago
+    return false;
+}
 async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRateBps, attemptNum) {
     client.solautoPositionState = await client.getFreshPositionState();
     if ((client.solautoPositionState?.supply.amountUsed.baseUnit === BigInt(0) &&
@@ -336,8 +354,10 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     const swapDetails = (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, targetLiqUtilizationRateBps, attemptNum);
     const { jupQuote, priceImpactBps, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);
     const flashLoan = (0, rebalanceUtils_1.getFlashLoanDetails)(client, values, jupQuote, priceImpactBps);
-    console.log((0, generalUtils_1.safeGetPrice)(client.supplyMint), (0, generalUtils_1.safeGetPrice)(client.debtMint));
     let tx = (0, umi_1.transactionBuilder)();
+    if (requiresRefreshBeforeRebalance(client)) {
+        tx = tx.add(client.refresh());
+    }
     if (flashLoan) {
         client.log("Flash loan details: ", flashLoan);
         const addFirstRebalance = values.amountUsdToDcaIn > 0;
@@ -368,10 +388,6 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
             client.rebalance("B", swapDetails, rebalanceType, undefined, targetLiqUtilizationRateBps),
         ]);
     }
-    if (client.solautoPositionState.liqUtilizationRateBps >
-        (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.01)) {
-        tx = tx.prepend(client.refresh());
-    }
     return {
         tx,
         lookupTableAddresses,

package/package.json

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

package/src/transactions/transactionUtils.ts

@@ -566,6 +566,33 @@ export async function getTransactionChores(
   return [choresBefore, choresAfter];
 }
 
+export function requiresRefreshBeforeRebalance(client: SolautoClient) {
+  if (
+    client.solautoPositionState!.liqUtilizationRateBps >
+    getMaxLiqUtilizationRateBps(
+      client.solautoPositionState!.maxLtvBps,
+      client.solautoPositionState!.liqThresholdBps,
+      0.01
+    )
+  ) {
+    return true;
+  } else if (client.solautoPositionData && !client.selfManaged) {
+    const oldSupply = client.solautoPositionData.state.supply.amountUsed.baseUnit;
+    const oldDebt = client.solautoPositionData.state.debt.amountUsed.baseUnit;
+
+    const supplyDiff = (client.solautoPositionState?.supply.amountUsed.baseUnit ?? BigInt(0)) - oldSupply;
+    const debtDiff = (client.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) - oldDebt;
+
+    if (Math.abs(Number(supplyDiff)) / Number(oldSupply) >= 0.01 || Math.abs(Number(debtDiff)) / Number(oldDebt) >= 0.01) {
+      return true;
+    }
+  }
+
+  // Rebalance ix will already refresh internally if position is self managed, has automation to update, or position state last updated >= 1 day ago
+
+  return false;
+}
+
 export async function buildSolautoRebalanceTransaction(
   client: SolautoClient,
   targetLiqUtilizationRateBps?: number,
@@ -625,13 +652,12 @@ export async function buildSolautoRebalanceTransaction(
     priceImpactBps
   );
 
-  console.log(
-    safeGetPrice(client.supplyMint),
-    safeGetPrice(client.debtMint)
-  )
-
   let tx = transactionBuilder();
 
+  if (requiresRefreshBeforeRebalance(client)) {
+    tx = tx.add(client.refresh());
+  }
+
   if (flashLoan) {
     client.log("Flash loan details: ", flashLoan);
     const addFirstRebalance = values.amountUsdToDcaIn > 0;
@@ -693,17 +719,6 @@ export async function buildSolautoRebalanceTransaction(
     ]);
   }
 
-  if (
-    client.solautoPositionState!.liqUtilizationRateBps >
-    getMaxLiqUtilizationRateBps(
-      client.solautoPositionState!.maxLtvBps,
-      client.solautoPositionState!.liqThresholdBps,
-      0.01
-    )
-  ) {
-    tx = tx.prepend(client.refresh());
-  }
-
   return {
     tx,
     lookupTableAddresses,