@strkfarm/sdk 1.1.33 → 1.1.35

package/src/strategies/universal-strategy.tsx

@@ -198,21 +198,7 @@ export class UniversalStrategy<
     };
   }
 
-  /**
-   * Calculates the weighted average APY across all pools based on USD value.
-   * @returns {Promise<number>} The weighted average APY across all pools
-   */
-  async netAPY(): Promise<{ net: number, splits: { apy: number, id: string }[] }> {
-    if (this.metadata.isPreview) {
-      return { net: 0, splits: [{
-        apy: 0, id: 'base'
-      }, {
-        apy: 0, id: 'defispring'
-      }] };
-    }
-    
-    const prevAUM = await this.getPrevAUM();
-   
+  async getVesuAPYs() {
     // get Vesu pools, positions and APYs
     const vesuAdapters = this.getVesuAdapters();
     const allVesuPools = await VesuAdapter.getVesuPools();
@@ -247,15 +233,28 @@ export class UniversalStrategy<
 
     // Else further compute will fail
     assert(baseAPYs.length == positions.length, 'APYs and positions length mismatch');
+    
+    return {
+      baseAPYs,
+      rewardAPYs,
+      positions
+    }
+  }
 
-    // If no positions, return 0
-    if (positions.every(p => p.amount.isZero())) {
+  /**
+   * Calculates the weighted average APY across all pools based on USD value.
+   * @returns {Promise<number>} The weighted average APY across all pools
+   */
+  async netAPY(): Promise<{ net: number, splits: { apy: number, id: string }[] }> {
+    if (this.metadata.isPreview) {
       return { net: 0, splits: [{
         apy: 0, id: 'base'
       }, {
         apy: 0, id: 'defispring'
-      }]};
+      }] };
     }
+    
+    const { positions, baseAPYs, rewardAPYs } = await this.getVesuAPYs();
 
     const unusedBalanceAPY = await this.getUnusedBalanceAPY();
     baseAPYs.push(...[unusedBalanceAPY.apy]);
@@ -264,6 +263,22 @@ export class UniversalStrategy<
     // Compute APy using weights
     const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
     weights.push(unusedBalanceAPY.weight);
+
+    return this.returnNetAPY(baseAPYs, rewardAPYs, weights);
+  }
+
+  protected async returnNetAPY(baseAPYs: number[], rewardAPYs: number[], weights: number[]) {
+    // If no positions, return 0
+    if (weights.every(p => p == 0)) {
+      return { net: 0, splits: [{
+        apy: 0, id: 'base'
+      }, {
+        apy: 0, 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);