@strkfarm/sdk 1.1.36 → 1.1.38

package/dist/index.browser.global.js

@@ -93328,9 +93328,12 @@ spurious results.`);
       rewardAPYs.push(0);
       const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
       weights.push(unusedBalanceAPY.weight);
-      return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+      const prevAUM = await this.getPrevAUM();
+      const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
+      const prevAUMUSD = prevAUM.multipliedBy(price.price);
+      return this.returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD);
     }
-    async returnNetAPY(baseAPYs, rewardAPYs, weights) {
+    async returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD) {
       if (weights.every((p) => p == 0)) {
         return { net: 0, splits: [{
           apy: 0,
@@ -93340,9 +93343,6 @@ spurious results.`);
           id: "defispring"
         }] };
       }
-      const prevAUM = await this.getPrevAUM();
-      const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
-      const prevAUMUSD = prevAUM.multipliedBy(price.price);
       const baseAPY = this.computeAPY(baseAPYs, weights, prevAUMUSD);
       const rewardAPY = this.computeAPY(rewardAPYs, weights, prevAUMUSD);
       const netAPY = baseAPY + rewardAPY;
@@ -94490,12 +94490,20 @@ spurious results.`);
     async netAPY() {
       const unusedBalance = await this.getUnusedBalance();
       const maxNewDeposits = await this.maxNewDeposits();
+      const lstAPY = await this.getLSTAPR(this.getLSTUnderlyingTokenInfo().address);
       if (maxNewDeposits * 1.5 < unusedBalance.amount.toNumber()) {
-        return super.netAPY();
+        logger2.verbose(`${this.getTag()}::netAPY: unused balance is > max servicable from loan, lstAPY: ${lstAPY}`);
+        const output = await super.netAPY();
+        output.splits.push({ apy: lstAPY, id: "lst_apy" });
+        return output;
       } else {
+        logger2.verbose(`${this.getTag()}::netAPY: we can take more deposits, use theoretical max APY`);
         const { positions, baseAPYs, rewardAPYs } = await this.getVesuAPYs();
         const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
-        return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+        const aum = weights.reduce((acc, curr) => acc + curr, 0);
+        const output = await this.returnNetAPY(baseAPYs, rewardAPYs, weights, new Web3Number(aum.toFixed(9), this.getLSTUnderlyingTokenInfo().decimals));
+        output.splits.push({ apy: lstAPY, id: "lst_apy" });
+        return output;
       }
     }
     async maxNewDeposits() {

package/dist/index.browser.mjs

@@ -29421,9 +29421,12 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
     rewardAPYs.push(0);
     const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
     weights.push(unusedBalanceAPY.weight);
-    return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+    const prevAUM = await this.getPrevAUM();
+    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
+    const prevAUMUSD = prevAUM.multipliedBy(price.price);
+    return this.returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD);
   }
-  async returnNetAPY(baseAPYs, rewardAPYs, weights) {
+  async returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD) {
     if (weights.every((p) => p == 0)) {
       return { net: 0, splits: [{
         apy: 0,
@@ -29433,9 +29436,6 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
         id: "defispring"
       }] };
     }
-    const prevAUM = await this.getPrevAUM();
-    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
-    const prevAUMUSD = prevAUM.multipliedBy(price.price);
     const baseAPY = this.computeAPY(baseAPYs, weights, prevAUMUSD);
     const rewardAPY = this.computeAPY(rewardAPYs, weights, prevAUMUSD);
     const netAPY = baseAPY + rewardAPY;
@@ -30584,12 +30584,20 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
   async netAPY() {
     const unusedBalance = await this.getUnusedBalance();
     const maxNewDeposits = await this.maxNewDeposits();
+    const lstAPY = await this.getLSTAPR(this.getLSTUnderlyingTokenInfo().address);
     if (maxNewDeposits * 1.5 < unusedBalance.amount.toNumber()) {
-      return super.netAPY();
+      logger.verbose(`${this.getTag()}::netAPY: unused balance is > max servicable from loan, lstAPY: ${lstAPY}`);
+      const output = await super.netAPY();
+      output.splits.push({ apy: lstAPY, id: "lst_apy" });
+      return output;
     } else {
+      logger.verbose(`${this.getTag()}::netAPY: we can take more deposits, use theoretical max APY`);
       const { positions, baseAPYs, rewardAPYs } = await this.getVesuAPYs();
       const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
-      return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+      const aum = weights.reduce((acc, curr) => acc + curr, 0);
+      const output = await this.returnNetAPY(baseAPYs, rewardAPYs, weights, new Web3Number(aum.toFixed(9), this.getLSTUnderlyingTokenInfo().decimals));
+      output.splits.push({ apy: lstAPY, id: "lst_apy" });
+      return output;
     }
   }
   async maxNewDeposits() {

package/dist/index.d.ts

@@ -1226,7 +1226,7 @@ declare class UniversalStrategy<S extends UniversalStrategySettings> extends Bas
             id: string;
         }[];
     }>;
-    protected returnNetAPY(baseAPYs: number[], rewardAPYs: number[], weights: number[]): Promise<{
+    protected returnNetAPY(baseAPYs: number[], rewardAPYs: number[], weights: number[], prevAUMUSD: Web3Number): Promise<{
         net: number;
         splits: {
             apy: number;

package/dist/index.js

@@ -29420,9 +29420,12 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
     rewardAPYs.push(0);
     const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
     weights.push(unusedBalanceAPY.weight);
-    return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+    const prevAUM = await this.getPrevAUM();
+    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
+    const prevAUMUSD = prevAUM.multipliedBy(price.price);
+    return this.returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD);
   }
-  async returnNetAPY(baseAPYs, rewardAPYs, weights) {
+  async returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD) {
     if (weights.every((p) => p == 0)) {
       return { net: 0, splits: [{
         apy: 0,
@@ -29432,9 +29435,6 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
         id: "defispring"
       }] };
     }
-    const prevAUM = await this.getPrevAUM();
-    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
-    const prevAUMUSD = prevAUM.multipliedBy(price.price);
     const baseAPY = this.computeAPY(baseAPYs, weights, prevAUMUSD);
     const rewardAPY = this.computeAPY(rewardAPYs, weights, prevAUMUSD);
     const netAPY = baseAPY + rewardAPY;
@@ -30583,12 +30583,20 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
   async netAPY() {
     const unusedBalance = await this.getUnusedBalance();
     const maxNewDeposits = await this.maxNewDeposits();
+    const lstAPY = await this.getLSTAPR(this.getLSTUnderlyingTokenInfo().address);
     if (maxNewDeposits * 1.5 < unusedBalance.amount.toNumber()) {
-      return super.netAPY();
+      logger.verbose(`${this.getTag()}::netAPY: unused balance is > max servicable from loan, lstAPY: ${lstAPY}`);
+      const output = await super.netAPY();
+      output.splits.push({ apy: lstAPY, id: "lst_apy" });
+      return output;
     } else {
+      logger.verbose(`${this.getTag()}::netAPY: we can take more deposits, use theoretical max APY`);
       const { positions, baseAPYs, rewardAPYs } = await this.getVesuAPYs();
       const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
-      return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+      const aum = weights.reduce((acc, curr) => acc + curr, 0);
+      const output = await this.returnNetAPY(baseAPYs, rewardAPYs, weights, new Web3Number(aum.toFixed(9), this.getLSTUnderlyingTokenInfo().decimals));
+      output.splits.push({ apy: lstAPY, id: "lst_apy" });
+      return output;
     }
   }
   async maxNewDeposits() {

package/dist/index.mjs

@@ -29319,9 +29319,12 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
     rewardAPYs.push(0);
     const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
     weights.push(unusedBalanceAPY.weight);
-    return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+    const prevAUM = await this.getPrevAUM();
+    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
+    const prevAUMUSD = prevAUM.multipliedBy(price.price);
+    return this.returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD);
   }
-  async returnNetAPY(baseAPYs, rewardAPYs, weights) {
+  async returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD) {
     if (weights.every((p) => p == 0)) {
       return { net: 0, splits: [{
         apy: 0,
@@ -29331,9 +29334,6 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
         id: "defispring"
       }] };
     }
-    const prevAUM = await this.getPrevAUM();
-    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
-    const prevAUMUSD = prevAUM.multipliedBy(price.price);
     const baseAPY = this.computeAPY(baseAPYs, weights, prevAUMUSD);
     const rewardAPY = this.computeAPY(rewardAPYs, weights, prevAUMUSD);
     const netAPY = baseAPY + rewardAPY;
@@ -30482,12 +30482,20 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
   async netAPY() {
     const unusedBalance = await this.getUnusedBalance();
     const maxNewDeposits = await this.maxNewDeposits();
+    const lstAPY = await this.getLSTAPR(this.getLSTUnderlyingTokenInfo().address);
     if (maxNewDeposits * 1.5 < unusedBalance.amount.toNumber()) {
-      return super.netAPY();
+      logger.verbose(`${this.getTag()}::netAPY: unused balance is > max servicable from loan, lstAPY: ${lstAPY}`);
+      const output = await super.netAPY();
+      output.splits.push({ apy: lstAPY, id: "lst_apy" });
+      return output;
     } else {
+      logger.verbose(`${this.getTag()}::netAPY: we can take more deposits, use theoretical max APY`);
       const { positions, baseAPYs, rewardAPYs } = await this.getVesuAPYs();
       const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
-      return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+      const aum = weights.reduce((acc, curr) => acc + curr, 0);
+      const output = await this.returnNetAPY(baseAPYs, rewardAPYs, weights, new Web3Number(aum.toFixed(9), this.getLSTUnderlyingTokenInfo().decimals));
+      output.splits.push({ apy: lstAPY, id: "lst_apy" });
+      return output;
     }
   }
   async maxNewDeposits() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.1.36",
+  "version": "1.1.38",
   "description": "STRKFarm TS SDK (Meant for our internal use, but feel free to use it)",
   "typings": "dist/index.d.ts",
   "types": "dist/index.d.ts",

package/src/strategies/universal-lst-muliplier-strategy.tsx

@@ -460,17 +460,25 @@ export class UniversalLstMultiplierStrategy extends UniversalStrategy<HyperLSTSt
   async netAPY(): Promise<{ net: number; splits: { apy: number; id: string; }[]; }> {
     const unusedBalance = await this.getUnusedBalance();
     const maxNewDeposits = await this.maxNewDeposits();
+    const lstAPY = await this.getLSTAPR(this.getLSTUnderlyingTokenInfo().address);
 
     // if unused balance is > max servicable from loan, we are limited by the max borrowing we can do
     // we also allow accepting little higher deposits (1.5x) to have room for future looping when theres more liquidity or debt cap rises
     if (maxNewDeposits * 1.5 < unusedBalance.amount.toNumber()) {
       // we have excess, just use real APY
-      return super.netAPY();
+      logger.verbose(`${this.getTag()}::netAPY: unused balance is > max servicable from loan, lstAPY: ${lstAPY}`);
+      const output = await super.netAPY();
+      output.splits.push({apy: lstAPY, id: 'lst_apy'});
+      return output;
     } else {
       // we have little bit room to accept more deposits, we use theoretical max APY
+      logger.verbose(`${this.getTag()}::netAPY: we can take more deposits, use theoretical max APY`);
       const { positions, baseAPYs, rewardAPYs } = await this.getVesuAPYs();
       const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
-      return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+      const aum = weights.reduce((acc, curr) => acc + curr, 0);
+      const output = await this.returnNetAPY(baseAPYs, rewardAPYs, weights, new Web3Number(aum.toFixed(9), this.getLSTUnderlyingTokenInfo().decimals));
+      output.splits.push({apy: lstAPY, id: 'lst_apy'});
+      return output;
     }
   }
 

package/src/strategies/universal-strategy.tsx

@@ -264,10 +264,13 @@ export class UniversalStrategy<
     const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
     weights.push(unusedBalanceAPY.weight);
 
-    return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+    const prevAUM = await this.getPrevAUM();
+    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
+    const prevAUMUSD = prevAUM.multipliedBy(price.price);
+    return this.returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD);
   }
 
-  protected async returnNetAPY(baseAPYs: number[], rewardAPYs: number[], weights: number[]) {
+  protected async returnNetAPY(baseAPYs: number[], rewardAPYs: number[], weights: number[], prevAUMUSD: Web3Number) {
     // If no positions, return 0
     if (weights.every(p => p == 0)) {
       return { net: 0, splits: [{
@@ -277,10 +280,6 @@ export class UniversalStrategy<
       }]};
     }
 
-    const prevAUM = await this.getPrevAUM();
-
-    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
-    const prevAUMUSD = prevAUM.multipliedBy(price.price);
     const baseAPY = this.computeAPY(baseAPYs, weights, prevAUMUSD);
     const rewardAPY = this.computeAPY(rewardAPYs, weights, prevAUMUSD);
     const netAPY = baseAPY + rewardAPY;