@haven-fi/solauto-sdk 1.0.607 → 1.0.608

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -67,6 +67,9 @@ export declare abstract class SolautoPositionEx {
     utilizationRateBpsDrift(): Promise<number>;
     updateWithLatestPrices(supplyPrice?: number, debtPrice?: number): Promise<void>;
     refetchPositionData(): Promise<void>;
+    updateNetWorth(supplyPrice: number, debtPrice: number): void;
+    updateSupply(newSupplyUsd: number, supplyPrice: number): void;
+    updateDebt(newDebtUsd: number, debtPrice: number): void;
     simulateRebalance(unixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number): void;
 }
 export {};

package/dist/solautoPosition/solautoPositionEx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,WAAW,EAEX,eAAe,EACf,aAAa,EACb,eAAe,EACf,yBAAyB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAQL,cAAc,EAYf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,OAAO,EAAqC,SAAS,EAAE,MAAM,cAAc,CAAC;AAM5E,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,UAAU,qBAAsB,SAAQ,OAAO,CAAC,eAAe,CAAC;IAC9D,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,8BAAsB,iBAAiB;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAG,qBAAqB,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,CAAa;IAC9B,aAAa,CAAC,EAAE,SAAS,CAAa;IAC7C,SAAS,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;gBAEhC,IAAI,EAAE,cAAc;IAgBhC,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAE1C,MAAM;IAIN,SAAS;IAMT,UAAU;IAIV,YAAY;IAOZ,IAAI,IAAI,qBAAqB;IAI7B,KAAK,IAAI,aAAa;IAItB,QAAQ,IAAI,yBAAyB,GAAG,SAAS;IAIjD,GAAG,IAAI,WAAW,GAAG,SAAS;IAI9B,UAAU,IAAI,SAAS;IAIvB,cAAc,IAAI,SAAS;IAI3B,QAAQ,IAAI,SAAS;IAIrB,YAAY,IAAI,SAAS;IAIzB,UAAU;IAOV,YAAY;IAIZ,UAAU;IAOV,YAAY;IAMZ,QAAQ;IAIR,WAAW;IAIX,WAAW;IAIX,SAAS;IAIT,SAAS;IAIT,OAAO;IAIP,6BAA6B;IAI7B,yBAAyB;IAIzB,QAAQ,CAAC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9D,QAAQ,CAAC,0BAA0B,IAAI,MAAM;IAC7C,QAAQ,CAAC,wBAAwB,IAAI,MAAM;IAC3C,QAAQ,CAAC,sBAAsB,IAAI,MAAM;IAEzC,0BAA0B;IA0B1B,oBAAoB,CAAC,oBAAoB,SAAI,GAAG,eAAe,GAAG,SAAS;IAqB3E,kBAAkB,IAAI,OAAO;IAS7B,SAAS,CAAC,uBAAuB;IAWjC,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAExC,uBAAuB;IAiBvB,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAQ/D,mBAAmB;IAOzB,iBAAiB,CACf,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM;CAsCvC"}
+{"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"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"}

package/dist/solautoPosition/solautoPositionEx.js

@@ -100,7 +100,8 @@ class SolautoPositionEx {
         const limitsUpToDate = this.debtLiquidityUsdAvailable() !== 0 ||
             this.supplyLiquidityUsdDepositable() !== 0;
         if (limitsUpToDate) {
-            const { debtAdjustmentUsd } = (0, rebalance_1.getDebtAdjustment)(this.state().liqThresholdBps, { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() }, this.boostToBps(), { solauto: 50, lpBorrow: 50, flashLoan: 50 });
+            const { debtAdjustmentUsd } = (0, rebalance_1.getDebtAdjustment)(this.state().liqThresholdBps, { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() }, this.boostToBps(), { solauto: 50, lpBorrow: 50, flashLoan: 50 } // TODO: get true data here instead of magic numbers
+            );
             const sufficientLiquidity = this.debtLiquidityUsdAvailable() * 0.95 > debtAdjustmentUsd &&
                 this.supplyLiquidityUsdDepositable() * 0.95 > debtAdjustmentUsd;
             if (!sufficientLiquidity) {
@@ -152,19 +153,28 @@ class SolautoPositionEx {
     async refetchPositionData() {
         this._data = await (0, generated_1.fetchSolautoPosition)(this.umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(this.publicKey));
     }
-    simulateRebalance(unixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps) {
-        this._data.state.lastRefreshed = BigInt(unixTime);
-        const rebalance = (0, rebalance_1.getRebalanceValues)(this, targetLiqUtilizationRateBps, rebalance_1.SolautoFeesBps.create(true, targetLiqUtilizationRateBps, this.netWorthUsd()));
-        const newDebtUsd = rebalance.endResult.debtUsd;
-        const newSupplyUsd = rebalance.endResult.supplyUsd;
-        this._data.state.debt.amountUsed.baseAmountUsdValue =
-            (0, utils_1.toRoundedUsdValue)(newDebtUsd);
-        this._data.state.debt.amountUsed.baseUnit = (0, utils_1.toBaseUnit)(newDebtUsd / debtPrice, this.debtMintInfo().decimals);
+    updateNetWorth(supplyPrice, debtPrice) {
+        const netWorthUsd = this.supplyUsd() - this.debtUsd();
+        this._data.state.netWorth.baseAmountUsdValue =
+            (0, utils_1.toRoundedUsdValue)(netWorthUsd);
+        this._data.state.netWorth.baseUnit = (0, utils_1.toBaseUnit)(netWorthUsd / supplyPrice, this.supplyMintInfo().decimals);
+    }
+    updateSupply(newSupplyUsd, supplyPrice) {
         this._data.state.supply.amountUsed.baseAmountUsdValue =
             (0, utils_1.toRoundedUsdValue)(newSupplyUsd);
         this._data.state.supply.amountUsed.baseUnit = (0, utils_1.toBaseUnit)(newSupplyUsd / supplyPrice, this.supplyMintInfo().decimals);
-        this._data.state.netWorth.baseAmountUsdValue = (0, utils_1.toRoundedUsdValue)(newSupplyUsd - newDebtUsd);
-        this._data.state.netWorth.baseUnit = (0, utils_1.toBaseUnit)((newSupplyUsd - newDebtUsd) / supplyPrice, this.supplyMintInfo().decimals);
+    }
+    updateDebt(newDebtUsd, debtPrice) {
+        this._data.state.debt.amountUsed.baseAmountUsdValue =
+            (0, utils_1.toRoundedUsdValue)(newDebtUsd);
+        this._data.state.debt.amountUsed.baseUnit = (0, utils_1.toBaseUnit)(newDebtUsd / debtPrice, this.debtMintInfo().decimals);
+    }
+    simulateRebalance(unixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps) {
+        this._data.state.lastRefreshed = BigInt(unixTime);
+        const rebalance = (0, rebalance_1.getRebalanceValues)(this, targetLiqUtilizationRateBps, rebalance_1.SolautoFeesBps.create(true, targetLiqUtilizationRateBps, this.netWorthUsd()));
+        this.updateSupply(rebalance.endResult.supplyUsd, supplyPrice);
+        this.updateDebt(rebalance.endResult.debtUsd, debtPrice);
+        this.updateNetWorth(supplyPrice, debtPrice);
     }
 }
 exports.SolautoPositionEx = SolautoPositionEx;

package/package.json

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

package/src/solautoPosition/solautoPositionEx.ts

@@ -213,7 +213,7 @@ export abstract class SolautoPositionEx {
         this.state().liqThresholdBps,
         { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() },
         this.boostToBps(),
-        { solauto: 50, lpBorrow: 50, flashLoan: 50 }, // TODO: get true data here instead of magic numbers
+        { solauto: 50, lpBorrow: 50, flashLoan: 50 } // TODO: get true data here instead of magic numbers
       );
 
       const sufficientLiquidity =
@@ -304,6 +304,34 @@ export abstract class SolautoPositionEx {
     );
   }
 
+  updateNetWorth(supplyPrice: number, debtPrice: number) {
+    const netWorthUsd = this.supplyUsd() - this.debtUsd();
+    this._data.state.netWorth.baseAmountUsdValue =
+      toRoundedUsdValue(netWorthUsd);
+    this._data.state.netWorth.baseUnit = toBaseUnit(
+      netWorthUsd / supplyPrice,
+      this.supplyMintInfo().decimals
+    );
+  }
+
+  updateSupply(newSupplyUsd: number, supplyPrice: number) {
+    this._data.state.supply.amountUsed.baseAmountUsdValue =
+      toRoundedUsdValue(newSupplyUsd);
+    this._data.state.supply.amountUsed.baseUnit = toBaseUnit(
+      newSupplyUsd / supplyPrice,
+      this.supplyMintInfo().decimals
+    );
+  }
+
+  updateDebt(newDebtUsd: number, debtPrice: number) {
+    this._data.state.debt.amountUsed.baseAmountUsdValue =
+      toRoundedUsdValue(newDebtUsd);
+    this._data.state.debt.amountUsed.baseUnit = toBaseUnit(
+      newDebtUsd / debtPrice,
+      this.debtMintInfo().decimals
+    );
+  }
+
   simulateRebalance(
     unixTime: number,
     supplyPrice: number,
@@ -320,30 +348,8 @@ export abstract class SolautoPositionEx {
         this.netWorthUsd()
       )
     );
-
-    const newDebtUsd = rebalance.endResult.debtUsd;
-    const newSupplyUsd = rebalance.endResult.supplyUsd;
-
-    this._data.state.debt.amountUsed.baseAmountUsdValue =
-      toRoundedUsdValue(newDebtUsd);
-    this._data.state.debt.amountUsed.baseUnit = toBaseUnit(
-      newDebtUsd / debtPrice,
-      this.debtMintInfo().decimals
-    );
-
-    this._data.state.supply.amountUsed.baseAmountUsdValue =
-      toRoundedUsdValue(newSupplyUsd);
-    this._data.state.supply.amountUsed.baseUnit = toBaseUnit(
-      newSupplyUsd / supplyPrice,
-      this.supplyMintInfo().decimals
-    );
-
-    this._data.state.netWorth.baseAmountUsdValue = toRoundedUsdValue(
-      newSupplyUsd - newDebtUsd
-    );
-    this._data.state.netWorth.baseUnit = toBaseUnit(
-      (newSupplyUsd - newDebtUsd) / supplyPrice,
-      this.supplyMintInfo().decimals
-    );
+    this.updateSupply(rebalance.endResult.supplyUsd, supplyPrice);
+    this.updateDebt(rebalance.endResult.debtUsd, debtPrice);
+    this.updateNetWorth(supplyPrice, debtPrice);
   }
 }