@aurigami/sdk 1.12.9 → 1.13.0

package/src/interactors/misc.ts

@@ -25,9 +25,7 @@ export class MiscRead extends BlockchainEntityRead {
     const marketCount = consts.networkAddresses.auTokens.length;
     var userMarketDetails: types.UserMarketDetails[] = [],
       assetsIn: string[];
-    var promises = [];
     var totalBorrowLimit = new BigNumber(0);
-    var pricePromises = [];
     for (const auToken of consts.networkAddresses.auTokens) {
       const userMarketDetail: types.UserMarketDetails = {} as types.UserMarketDetails;
       userMarketDetails.push(userMarketDetail);
@@ -37,37 +35,21 @@ export class MiscRead extends BlockchainEntityRead {
         auToken.address,
         auToken.underlying
       );
-      promises.push(
-        moneyMarket.getUserDepositBalance(userAddress).then((res: TokenAmount) => {
-          userMarketDetail.depositBalance = res;
-        })
-      );
-      promises.push(
-        moneyMarket.getUserBorrowBalance(userAddress).then((res: TokenAmount) => {
-          userMarketDetail.borrowBalance = res;
-        })
-      );
-      promises.push(
-        moneyMarket.getCollateralRatio().then((res: BigNumber) => {
-          userMarketDetail.collateralRatio = res.toNumber();
-        })
-      );
-      pricePromises.push(
-        fetchPrice(moneyMarket.underlying.address, this._networkConnection.provider).then((res) => {
-          userMarketDetail.underlyingPrice = res.toString();
-          return res;
-        })
-      );
+      const [depositBalance, borrowBalance, collateralRatio, underlyingPrice] = await Promise.all([
+        moneyMarket.getUserDepositBalance(userAddress),
+        moneyMarket.getUserBorrowBalance(userAddress),
+        moneyMarket.getCollateralRatio(),
+        fetchPrice(moneyMarket.underlying.address, this._networkConnection.provider),
+      ]);
+
+      userMarketDetail.depositBalance = depositBalance;
+      userMarketDetail.borrowBalance = borrowBalance;
+      userMarketDetail.collateralRatio = collateralRatio.toNumber();
+      userMarketDetail.underlyingPrice = underlyingPrice.toString();
     }
 
-    promises.push(
-      this.env.comptroller.getAssetsIn(userAddress).then((res: string[]) => {
-        assetsIn = res;
-      })
-    );
+    assetsIn = await this.env.comptroller.getAssetsIn(userAddress);
 
-    await Promise.all(promises);
-    var underlyingPrices = await Promise.all(pricePromises);
     var depositValues = [];
     for (var i = 0; i < marketCount; i++) {
       const auToken = consts.networkAddresses.auTokens[i];
@@ -79,7 +61,12 @@ export class MiscRead extends BlockchainEntityRead {
       } else {
         userMarketDetails[i].isCollateral = false;
       }
-      depositValues.push(calcValuation(userMarketDetails[i].depositBalance, underlyingPrices[i]));
+      depositValues.push(
+        calcValuation(
+          userMarketDetails[i].depositBalance,
+          new BigNumber(userMarketDetails[i].underlyingPrice)
+        )
+      );
     }
 
     totalBorrowLimit = depositValues.reduce((p: BigNumber, v: BigNumber, index: number) => {
@@ -123,7 +110,7 @@ export class MiscRead extends BlockchainEntityRead {
         : new BigNumber(0);
       const maxWithdrawCap: BigNumber = borrowLimitMargin
         .div(userMarketDetails[i].collateralRatio)
-        .div(underlyingPrices[i]);
+        .div(userMarketDetails[i].underlyingPrice);
       userMarketDetails[i].maxWithdrawableAmount =
         userMarketDetails[i].isCollateral &&
         maxWithdrawCap.lt(userMarketDetails[i].depositBalance.formattedAmount())
@@ -320,4 +307,67 @@ export class MiscRead extends BlockchainEntityRead {
     }
     return res;
   }
+
+  public async getNetApyWithoutIncentive(userAddress: types.Address): Promise<BigNumber> {
+    let sum = new BigNumber(0);
+    let totalSuppliedValue = new BigNumber(0);
+    let totalBorrowedValue = new BigNumber(0);
+    let netApy = new BigNumber(0);
+
+    const apys = await Promise.all(
+      consts.networkAddresses.auTokens.map((auToken) => {
+        const moneyMarket: MoneyMarketRead = new MoneyMarketRead(
+          this._networkConnection,
+          auToken.address,
+          auToken.underlying
+        );
+        const apyWithoutIncentive = moneyMarket.getApyWithoutIncentive(userAddress);
+        return apyWithoutIncentive;
+      })
+    );
+
+    for (const apy of apys) {
+      sum = sum.plus(apy.sum);
+      totalSuppliedValue = totalSuppliedValue.plus(apy.suppliedValue);
+      totalBorrowedValue = totalBorrowedValue.plus(apy.borrowedValue);
+    }
+
+    if (sum.gt(0)) {
+      netApy = sum.div(totalSuppliedValue);
+    } else if (sum.lt(0)) {
+      netApy = sum.div(totalBorrowedValue);
+    }
+    return netApy;
+  }
+
+  public async getNetApyWithIncentive(userAddress: types.Address): Promise<BigNumber> {
+    let sum = new BigNumber(0);
+    let totalSuppliedValue = new BigNumber(0);
+    let totalBorrowedValue = new BigNumber(0);
+    let netApy = new BigNumber(0);
+    const apys = await Promise.all(
+      consts.networkAddresses.auTokens.map((auToken) => {
+        const moneyMarket: MoneyMarketRead = new MoneyMarketRead(
+          this._networkConnection,
+          auToken.address,
+          auToken.underlying
+        );
+        const apyWithIncentive = moneyMarket.getApyWithIncentive(userAddress);
+        return apyWithIncentive;
+      })
+    );
+
+    for (const apy of apys) {
+      sum = sum.plus(apy.sum);
+      totalSuppliedValue = totalSuppliedValue.plus(apy.suppliedValue);
+      totalBorrowedValue = totalBorrowedValue.plus(apy.borrowedValue);
+    }
+
+    if (sum.gt(0)) {
+      netApy = sum.div(totalSuppliedValue);
+    } else if (sum.lt(0)) {
+      netApy = sum.div(totalBorrowedValue);
+    }
+    return netApy;
+  }
 }

package/src/types/index.ts

@@ -183,3 +183,9 @@ export type PlyGameLeaderboardItem = {
 export type PlyBetMadeEvent = TypedEvent<
   [string, BN, number] & { player: string; amount: BN; outcome: number }
 >;
+
+export type Apy = {
+  sum: BigNumber;
+  suppliedValue: BigNumber;
+  borrowedValue: BigNumber;
+};