@gearbox-protocol/sdk 0.0.102 → 0.0.103

package/src/core/strategy.ts

@@ -1,6 +1,6 @@
 import { BigNumber } from "ethers";
-import { LEVERAGE_DECIMALS, PERCENTAGE_FACTOR, WAD } from "../core/constants";
-import { calcTotalPrice } from "../core/price";
+import { LEVERAGE_DECIMALS, PERCENTAGE_FACTOR, WAD } from "./constants";
+import { calcTotalPrice } from "./price";
 
 export interface StrategyPayload {
   apy?: number;
@@ -31,10 +31,13 @@ export class Strategy {
   apy: number | undefined;
 
   name: string;
+
   lpToken: string;
+
   pools: Array<string>;
 
   unleveragableCollateral: Array<string>;
+
   leveragableCollateral: Array<string>;
 
   baseAssets: Array<string>;
@@ -50,10 +53,15 @@ export class Strategy {
     this.baseAssets = payload.baseAssets;
   }
 
-  public maxAPY(apy: number, maxLeverage: number, poolApy: PoolList) {
-    const minApy = this.minBorrowApy(poolApy);
+  public maxAPY(maxLeverage: number, poolApy: PoolList) {
+    const minApy = minBorrowApy(poolApy);
 
-    return this.roi(apy, maxLeverage, maxLeverage - LEVERAGE_DECIMALS, minApy);
+    return roi(
+      this.apy || 0,
+      maxLeverage,
+      maxLeverage - LEVERAGE_DECIMALS,
+      minApy
+    );
   }
 
   public overallAPY(
@@ -64,9 +72,10 @@ export class Strategy {
   ) {
     const farmLev = this.farmLev(leverage, depositCollateral);
 
-    return this.roi(apy, farmLev, leverage - LEVERAGE_DECIMALS, borrowAPY);
+    return roi(apy, farmLev, leverage - LEVERAGE_DECIMALS, borrowAPY);
   }
 
+  // eslint-disable-next-line class-methods-use-this
   public liquidationPrice(
     borrowed: TokenDescription,
     collateral: TokenDescription,
@@ -92,23 +101,6 @@ export class Strategy {
       : BigNumber.from(0);
   }
 
-  private roi(
-    apy: number,
-    farmLev: number,
-    debtLev: number,
-    borrowAPY: number
-  ) {
-    return (apy * farmLev - borrowAPY * debtLev) / LEVERAGE_DECIMALS;
-  }
-
-  private minBorrowApy(poolApy: PoolList) {
-    const apys = Object.values(poolApy).sort(
-      (a, b) => a.borrowRate - b.borrowRate
-    );
-
-    return apys.length > 0 ? apys[0].borrowRate : 0;
-  }
-
   private farmLev(leverage: number, depositCollateral: string) {
     return this.inBaseAssets(depositCollateral) ||
       this.inLeveragableAssets(depositCollateral)
@@ -128,3 +120,15 @@ export class Strategy {
     );
   }
 }
+
+function roi(apy: number, farmLev: number, debtLev: number, borrowAPY: number) {
+  return (apy * farmLev - borrowAPY * debtLev) / LEVERAGE_DECIMALS;
+}
+
+function minBorrowApy(poolApy: PoolList) {
+  const apys = Object.values(poolApy).sort(
+    (a, b) => a.borrowRate - b.borrowRate
+  );
+
+  return apys.length > 0 ? apys[0].borrowRate : 0;
+}

package/src/core/tokenDistributor.ts

@@ -1,4 +1,4 @@
-import {BigNumber} from "ethers";
+import { BigNumber } from "ethers";
 
 export interface TokenShare {
   holder: string;
@@ -10,5 +10,5 @@ export interface TokenShare {
 export enum VotingPower {
   A, // A-type voting power & A-type vesting parameters
   B, // B-type voting power & B-type vesting parameters
-  ZERO_VOTING_POWER, // zero voting power & B-type vesting parameters
+  ZERO_VOTING_POWER // zero voting power & B-type vesting parameters
 }