@haven-fi/solauto-sdk 1.0.730 → 1.0.731

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

@@ -1 +1 @@
-{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAgCrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,wBAAwB,CAAC;IAVnC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,YAAY,CAAC,EAAE,OAAO,YAAA,EACtB,wBAAwB,CAAC,EAAE,MAAM,YAAA;IAG3C,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,oBAAoB;IAwC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAyBnB,sBAAsB;YAyBtB,mBAAmB;IAsFpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}
+{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAgCrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,wBAAwB,CAAC;IAVnC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,YAAY,CAAC,EAAE,OAAO,YAAA,EACtB,wBAAwB,CAAC,EAAE,MAAM,YAAA;IAG3C,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,oBAAoB;IAyC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA4CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAyBnB,sBAAsB;YAyBtB,mBAAmB;IAsFpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -28,17 +28,18 @@ class RebalanceTxBuilder {
     getRebalanceValues() {
         return (0, rebalanceValues_1.getRebalanceValues)(this.client.pos, this.priceType, this.targetLiqUtilizationRateBps, solautoFees_1.SolautoFeesBps.create(this.client.isReferred, this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd(this.priceType)), this.flRequirements?.flFeeBps ?? 0, this.bpsDistanceFromRebalance);
     }
-    getFlLiquiditySource(supplyLiquidityAvailable, debtLiquidityAvailable) {
+    getFlLiquiditySource(attemptNum, supplyLiquidityAvailable, debtLiquidityAvailable) {
         const debtAdjustmentUsd = Math.abs(this.values.debtAdjustmentUsd);
-        const insufficientLiquidity = (amountNeededUsd, liquidityAvailable, tokenMint) => {
-            const liquidityUsd = (0, utils_1.fromBaseUnit)(liquidityAvailable, (0, utils_1.tokenInfo)(tokenMint).decimals) *
-                ((0, utils_1.safeGetPrice)(tokenMint) ?? 0);
-            return amountNeededUsd > liquidityUsd * 0.95;
-        };
-        const insufficientSupplyLiquidity = insufficientLiquidity(debtAdjustmentUsd, supplyLiquidityAvailable, this.client.pos.supplyMint);
-        const insufficientDebtLiquidity = insufficientLiquidity(debtAdjustmentUsd, debtLiquidityAvailable, this.client.pos.debtMint);
+        const calcLiquidityAvailable = (liquidityAvailable, tokenMint) => (0, utils_1.fromBaseUnit)(liquidityAvailable, (0, utils_1.tokenInfo)(tokenMint).decimals) *
+            ((0, utils_1.safeGetPrice)(tokenMint) ?? 0);
+        const supplyLiquidityUsdAvailable = calcLiquidityAvailable(supplyLiquidityAvailable, this.client.pos.supplyMint);
+        const insufficientSupplyLiquidity = debtAdjustmentUsd > supplyLiquidityUsdAvailable * 0.95;
+        const debtLiquidityUsdAvailable = calcLiquidityAvailable(debtLiquidityAvailable, this.client.pos.debtMint);
+        const insufficientDebtLiquidity = debtAdjustmentUsd > debtLiquidityUsdAvailable * 0.95;
         let useDebtLiquidity = this.values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
-            insufficientSupplyLiquidity;
+            insufficientSupplyLiquidity ||
+            (attemptNum > 2 &&
+                debtLiquidityUsdAvailable > supplyLiquidityUsdAvailable * 5);
         if (useDebtLiquidity) {
             return !insufficientDebtLiquidity ? generated_1.TokenType.Debt : undefined;
         }
@@ -63,16 +64,16 @@ class RebalanceTxBuilder {
         });
         return intermediaryLiqUtilizationRateBps;
     }
-    async flashLoanRequirements() {
+    async flashLoanRequirements(attemptNum) {
         const intermediaryLiqUtilizationRateBps = this.intermediaryLiqUtilizationRateBps();
         const maxLtvRateBps = (0, utils_1.getMaxLiqUtilizationRateBps)(this.client.pos.state.maxLtvBps, this.client.pos.state.liqThresholdBps, 0.015);
         if (intermediaryLiqUtilizationRateBps < maxLtvRateBps) {
             return undefined;
         }
-        const stdFlLiquiditySource = this.getFlLiquiditySource(this.client.flProvider.liquidityAvailable(generated_1.TokenType.Supply), this.client.flProvider.liquidityAvailable(generated_1.TokenType.Debt));
+        const stdFlLiquiditySource = this.getFlLiquiditySource(attemptNum, this.client.flProvider.liquidityAvailable(generated_1.TokenType.Supply), this.client.flProvider.liquidityAvailable(generated_1.TokenType.Debt));
         if (stdFlLiquiditySource === undefined || this.optimizeSize) {
             const { supplyBalance, debtBalance } = await this.client.signerBalances();
-            const signerFlLiquiditySource = this.getFlLiquiditySource(supplyBalance, debtBalance);
+            const signerFlLiquiditySource = this.getFlLiquiditySource(attemptNum, supplyBalance, debtBalance);
             if (signerFlLiquiditySource) {
                 return {
                     liquiditySource: signerFlLiquiditySource,
@@ -156,7 +157,7 @@ class RebalanceTxBuilder {
             return false;
         }
         this.values = rebalanceValues;
-        this.flRequirements = await this.flashLoanRequirements();
+        this.flRequirements = await this.flashLoanRequirements(attemptNum);
         if (this.flRequirements?.flFeeBps) {
             this.values = this.getRebalanceValues();
         }

package/package.json

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

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -82,37 +82,38 @@ export class RebalanceTxBuilder {
   }
 
   private getFlLiquiditySource(
+    attemptNum: number,
     supplyLiquidityAvailable: bigint,
     debtLiquidityAvailable: bigint
   ): TokenType | undefined {
     const debtAdjustmentUsd = Math.abs(this.values.debtAdjustmentUsd);
 
-    const insufficientLiquidity = (
-      amountNeededUsd: number,
+    const calcLiquidityAvailable = (
       liquidityAvailable: bigint,
       tokenMint: PublicKey
-    ) => {
-      const liquidityUsd =
-        fromBaseUnit(liquidityAvailable, tokenInfo(tokenMint).decimals) *
-        (safeGetPrice(tokenMint) ?? 0);
-      return amountNeededUsd > liquidityUsd * 0.95;
-    };
+    ) =>
+      fromBaseUnit(liquidityAvailable, tokenInfo(tokenMint).decimals) *
+      (safeGetPrice(tokenMint) ?? 0);
 
-    const insufficientSupplyLiquidity = insufficientLiquidity(
-      debtAdjustmentUsd,
+    const supplyLiquidityUsdAvailable = calcLiquidityAvailable(
       supplyLiquidityAvailable,
       this.client.pos.supplyMint
     );
+    const insufficientSupplyLiquidity =
+      debtAdjustmentUsd > supplyLiquidityUsdAvailable * 0.95;
 
-    const insufficientDebtLiquidity = insufficientLiquidity(
-      debtAdjustmentUsd,
+    const debtLiquidityUsdAvailable = calcLiquidityAvailable(
       debtLiquidityAvailable,
       this.client.pos.debtMint
     );
+    const insufficientDebtLiquidity =
+      debtAdjustmentUsd > debtLiquidityUsdAvailable * 0.95;
 
     let useDebtLiquidity =
       this.values.rebalanceDirection === RebalanceDirection.Boost ||
-      insufficientSupplyLiquidity;
+      insufficientSupplyLiquidity ||
+      (attemptNum > 2 &&
+        debtLiquidityUsdAvailable > supplyLiquidityUsdAvailable * 5);
 
     if (useDebtLiquidity) {
       return !insufficientDebtLiquidity ? TokenType.Debt : undefined;
@@ -153,9 +154,9 @@ export class RebalanceTxBuilder {
     return intermediaryLiqUtilizationRateBps;
   }
 
-  private async flashLoanRequirements(): Promise<
-    FlashLoanRequirements | undefined
-  > {
+  private async flashLoanRequirements(
+    attemptNum: number
+  ): Promise<FlashLoanRequirements | undefined> {
     const intermediaryLiqUtilizationRateBps =
       this.intermediaryLiqUtilizationRateBps();
     const maxLtvRateBps = getMaxLiqUtilizationRateBps(
@@ -168,6 +169,7 @@ export class RebalanceTxBuilder {
     }
 
     const stdFlLiquiditySource = this.getFlLiquiditySource(
+      attemptNum,
       this.client.flProvider.liquidityAvailable(TokenType.Supply),
       this.client.flProvider.liquidityAvailable(TokenType.Debt)
     );
@@ -175,6 +177,7 @@ export class RebalanceTxBuilder {
     if (stdFlLiquiditySource === undefined || this.optimizeSize) {
       const { supplyBalance, debtBalance } = await this.client.signerBalances();
       const signerFlLiquiditySource = this.getFlLiquiditySource(
+        attemptNum,
         supplyBalance,
         debtBalance
       );
@@ -278,7 +281,7 @@ export class RebalanceTxBuilder {
     }
     this.values = rebalanceValues;
 
-    this.flRequirements = await this.flashLoanRequirements();
+    this.flRequirements = await this.flashLoanRequirements(attemptNum);
     if (this.flRequirements?.flFeeBps) {
       this.values = this.getRebalanceValues()!;
     }