@aurigami/sdk 0.2.2 → 0.2.6

package/src/MoneyMarket.ts

@@ -1,6 +1,5 @@
 import { BlockchainEntity, BlockchainEntityRead } from './BlockchainEntity';
-import { MoneyMarketDetails, NetworkConnection, Address } from './types';
-
+import { MoneyMarketDetails, NetworkConnection, Address, ComptrollerRewardType } from './types';
 import { Contract, BigNumber as BN } from 'ethers';
 import AuErc20ABI from '@aurigami/contracts/artifacts/contracts/AuErc20.sol/AuErc20.json';
 import AuETHABI from '@aurigami/contracts/artifacts/contracts/AuETH.sol/AuETH.json';
@@ -13,6 +12,7 @@ import { decimalFactor, isSameAddress } from './helpers';
 import { Token } from './token';
 import { TokenAmount } from './tokenAmount';
 import { getDecimal, validateAndParseAddress } from './helpers';
+import { calcLMRewardApr, DECIMAL_PRECISION, fetchPrice, fetchPriceFromCoingecko, ONE_YEAR, PLYToken } from '.';
 
 export class MoneyMarketRead extends BlockchainEntityRead {
   public underlying: Token;
@@ -41,7 +41,9 @@ export class MoneyMarketRead extends BlockchainEntityRead {
   public async getTotalTokenDeposited(): Promise<TokenAmount> {
     var promises = [];
     var totalBorrow: TokenAmount, totalCash: TokenAmount;
-    promises.push(this.getTotalTokenBorrowed().then((res: TokenAmount) => {totalBorrow = res}));
+    promises.push(this.getTotalTokenBorrowed().then((res: TokenAmount) => {
+      totalBorrow = res
+    }));
     promises.push(this.auToken.getCash().then((res: BN) => {
       totalCash =  new TokenAmount(
          this.underlying,
@@ -51,7 +53,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     await Promise.all(promises);
     return new TokenAmount(
       this.underlying,
-      BN.from(totalCash!.rawAmount).add(totalBorrow!.rawAmount()).toString()
+      BN.from(totalCash!.rawAmount()).add(totalBorrow!.rawAmount()).toString()
     )
   }
 
@@ -70,6 +72,40 @@ export class MoneyMarketRead extends BlockchainEntityRead {
       return new BigNumber(res.collateralFactorMantissa.toString()).div(decimalFactor(18));
     })
   }
+
+  public async getBorrowPlyAPY(): Promise<BigNumber> {
+    var promises = [];
+    var totalBorrowed: TokenAmount, rewardSpeed: TokenAmount, plyPrice: BigNumber, underlyingPrice: BigNumber;
+    promises.push(this.getTotalTokenBorrowed().then((res: TokenAmount) => {totalBorrowed = res}));
+    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address).then((res) => {
+      rewardSpeed = new TokenAmount(
+        PLYToken,
+        res.toString()
+      )
+    }));
+    promises.push(fetchPrice(networkAddresses.tokens.PLY, this._networkConnection.provider).then((res) => {plyPrice = res}));
+    promises.push(fetchPrice(this.underlying.address, this._networkConnection.provider).then((res) => {underlyingPrice = res}));
+    await Promise.all(promises);
+    return calcLMRewardApr(plyPrice!.multipliedBy(rewardSpeed!.formattedAmount()),
+    underlyingPrice!.multipliedBy(totalBorrowed!.formattedAmount()), ONE_YEAR);
+  }
+
+  public async getDepositPlyAPY(): Promise<BigNumber> {
+    var promises = [];
+    var totalDeposited: TokenAmount, rewardSpeed: TokenAmount, plyPrice: BigNumber, underlyingPrice: BigNumber;
+    promises.push(this.getTotalTokenDeposited().then((res: TokenAmount) => {totalDeposited = res}));
+    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address).then((res) => {
+      rewardSpeed = new TokenAmount(
+        PLYToken,
+        res.toString()
+      )
+    }));
+    promises.push(fetchPrice(networkAddresses.tokens.PLY, this._networkConnection.provider).then((res) => {plyPrice = res}));
+    promises.push(fetchPrice(this.underlying.address, this._networkConnection.provider).then((res) => {underlyingPrice = res}));
+    await Promise.all(promises);
+    return calcLMRewardApr(plyPrice!.multipliedBy(rewardSpeed!.formattedAmount()),
+    underlyingPrice!.multipliedBy(totalDeposited!.formattedAmount()), ONE_YEAR);
+  }
   public async getDetails(): Promise<MoneyMarketDetails> {
     var promises = [], totalDeposited: TokenAmount, totalBorrowed: TokenAmount, depositAPY: number, borrowAPY: number, collateralRatio: number;
     promises.push(this.getTotalTokenDeposited().then((res: TokenAmount) => {totalDeposited = res}));
@@ -77,16 +113,32 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     promises.push(this.getDepositAPY().then((res: BigNumber) => {depositAPY = res.toNumber()}));
     promises.push(this.getBorrowAPY().then((res: BigNumber) => {borrowAPY = res.toNumber()}));
     promises.push(this.getCollateralRatio().then((res: BigNumber) => {collateralRatio = res.toNumber()}));
-
+    
+    var rewardSpeed: TokenAmount, plyPrice: BigNumber, underlyingPrice: BigNumber;
+    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address).then((res) => {
+      rewardSpeed = new TokenAmount(
+        PLYToken,
+        res.toString()
+      )
+    }));
+    promises.push(fetchPrice(networkAddresses.tokens.PLY, this._networkConnection.provider).then((res) => {plyPrice = res}));
+    promises.push(fetchPrice(this.underlying.address, this._networkConnection.provider).then((res) => {underlyingPrice = res}));
+    
     await Promise.all(promises);
+    
+    var borrowPlyApy = calcLMRewardApr(plyPrice!.multipliedBy(rewardSpeed!.formattedAmount()),
+      underlyingPrice!.multipliedBy(totalBorrowed!.formattedAmount()), ONE_YEAR);
+    var depositPlyApy = calcLMRewardApr(plyPrice!.multipliedBy(rewardSpeed!.formattedAmount()),
+      underlyingPrice!.multipliedBy(totalDeposited!.formattedAmount()), ONE_YEAR);
+
     return {
       auTokenAddress: this.auToken.address,
       totalTokenDeposited: totalDeposited!,
       totalTokenBorrowed: totalBorrowed!,
       depositApy: depositAPY!,
-      depositPlyApy: 0.18, //To-do
+      depositPlyApy: depositPlyApy.toNumber(), 
       borrowApy: borrowAPY!,
-      borrowPlyApy: 0.18, // To-d0
+      borrowPlyApy: borrowPlyApy.toNumber(), 
       collateralRatio: collateralRatio!
     };
   }

package/src/constants.ts

@@ -9,6 +9,11 @@ export const AVAX_DEFAULT_PROVIDER = new ethers.providers.JsonRpcProvider(
   AVAX_DEFAULT_PROVIDER_URL
 );
 
+export const AURORA_DEFAULT_PROVIDER_URL = "https://testnet.aurora.dev";
+
+export const AURORA_DEFAULT_PROVIDER = new ethers.providers.JsonRpcProvider(
+  AURORA_DEFAULT_PROVIDER_URL
+);
 export const dummyAddress: string = "0xDEADbeEfEEeEEEeEEEeEEeeeeeEeEEeeeeEEEEeE";
 export const ETHAddress: string = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 
@@ -74,6 +79,15 @@ export const networkAddresses: NetworkAddresses = {
     PLY: "0x6f8a1daa158e08f75711a64e5a3073e959d688a6",
     AURPLY: dummyAddress
   }
+  // auTokens: [
+  //   {
+  //     address: "0x0222cd9f9079140d12980ffcb39851694533436c",
+  //     underlying: "0xb12bfca5a55806aaf64e99521918a4bf0fc40802"
+  //   },
+  //   {
+  //     address: 
+  //   }
+  // ]
 }
 
 export const BORROW_LIMIT_BUFFER = new BigNumber(0.95);
@@ -82,5 +96,7 @@ export const REWARDCLAIMSTART = 1673280000;
 
 export const ONE_DAY = 86400;
 
+export const ONE_YEAR = ONE_DAY * 365;
+
 export const AurPlyPid = 1;
 

package/src/priceFetcher.ts

@@ -11,7 +11,7 @@ import dummyABI from "./abis/dummy.json";
 
 const axios = require('axios')
 
-export async function fetchPriceFromCoingecko(id: string): Promise<BigNumber> {
+export async function fetchPriceFromCoingeckoAPI(id: string): Promise<BigNumber> {
     const price = await axios.get(
       `https://api.coingecko.com/api/v3/simple/price?ids=${id}&vs_currencies=usd`
     ).then((res: any) => {
@@ -21,11 +21,11 @@ export async function fetchPriceFromCoingecko(id: string): Promise<BigNumber> {
     return new BigNumber(price[id].usd)
 }
 
-export async function fetchBasicTokenPrice(address: Address): Promise<BigNumber> {
+export async function fetchPriceFromCoingecko(address: Address): Promise<BigNumber> {
     if (isSameAddress(address, networkAddresses.tokens.AURORA)) {
-        return fetchPriceFromCoingecko('aurora-near');
+        return fetchPriceFromCoingeckoAPI('aurora-near');
     } else {
-        throw Error(`Unknown token ${address} in fetchBasicTokenPrice`);
+        throw Error(`Unknown token ${address} in fetchPriceFromCoingecko`);
     }
 }
 
@@ -46,8 +46,8 @@ export async function fetchLPPositions(LPAddress: Address, provider: providers.P
     return {
         token0: values[0],
         token1: values[1],
-        reserve0: values[2]._reserve0,
-        reserve1: values[2]._reserve1,
+        reserve0: values[2].reserve0,
+        reserve1: values[2].reserve1,
         totalSupply: values[3]
     }
 }
@@ -74,6 +74,7 @@ function processPriceFromOracle(rawPrice: BN, underlyingDecimal: number) {
 }
 export async function fetchPriceFromOracle(auTokenAddress: Address, underlyingDecimal: number, provider: providers.Provider): Promise<BigNumber> {
     const oracleContract: PriceOracle = new Contract(networkAddresses.misc.oracle, OracleABI.abi, provider) as PriceOracle;
+    console.log(oracleContract.address, auTokenAddress);
     const rawPrice = await oracleContract.getUnderlyingPrice(auTokenAddress);
     return processPriceFromOracle(rawPrice, underlyingDecimal)
 }
@@ -100,7 +101,7 @@ export async function fetchPrice(address: Address, provider: providers.Provider)
     } else if (isSameAddress(address, networkAddresses.misc.AUPLYLP)) {
         return fetchLPPrice(address, provider);
     } else {
-        return fetchBasicTokenPrice(address);
+        return fetchPriceFromCoingecko(address);
     }
 }
 export async function fetchValuation(tokenAmount: TokenAmount, provider: providers.Provider, price?: BigNumber): Promise<BigNumber> {

package/src/types.ts

@@ -1,6 +1,10 @@
 import type { providers, Signer } from 'ethers';
 import { TokenAmount } from './tokenAmount';
 
+export enum ComptrollerRewardType {
+  PLY = 0,
+  AURORA
+};
 export type NetworkConnection = {
   provider: providers.Provider,
   signer?: Signer