@aurigami/sdk 1.0.3-fix → 1.1.0

package/dist/types.d.ts

@@ -22,6 +22,8 @@ export declare type MoneyMarketDetails = {
     borrowApy: number;
     borrowPlyApy: number;
     collateralRatio: number;
+    depositPlyPerWeek: TokenAmount;
+    BorrowPlyPerWeek: TokenAmount;
 };
 export declare type UserDetails = {
     markets: UserMarketDetails[];

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3-fix",
+  "version": "1.1.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "typescript": "^4.5.4"
   },
   "dependencies": {
-    "@aurigami/contracts": "2.4.4",
+    "@aurigami/contracts": "2.5.0-beta",
     "axios": "^0.24.0",
     "bignumber.js": "^9.0.2",
     "dotenv": "^16.0.0",

package/src/MoneyMarket.ts

@@ -8,7 +8,7 @@ import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/Au
 import EthRepayHelperABI from "@aurigami/contracts/artifacts/contracts/EthRepayHelper.sol/EthRepayHelper.json"
 import { AuErc20, AuETH, AuriLens, Comptroller, EthRepayHelper } from "@aurigami/contracts/typechain";
 import { TransactionResponse } from '@ethersproject/abstract-provider';
-import { networkAddresses, ETHAddress, ONE_YEAR, INF } from "./constants";
+import { networkAddresses, ETHAddress, ONE_YEAR, INF, ONE_DAY } from "./constants";
 import BigNumber from "bignumber.js";
 import { decimalFactor, isSameAddress, calcLMRewardApr } from './helpers';
 import { Token, PLYToken } from './token';
@@ -169,7 +169,15 @@ export class MoneyMarketRead extends BlockchainEntityRead {
       depositPlyApy: depositPlyApy.toNumber(), 
       borrowApy: borrowAPY!,
       borrowPlyApy: borrowPlyApy.toNumber(), 
-      collateralRatio: collateralRatio!
+      collateralRatio: collateralRatio!,
+      depositPlyPerWeek: new TokenAmount(
+        PLYToken,
+        rewardSpeeds!.plyRewardSupplySpeed.mul(ONE_DAY).mul(7).toString()
+      ),
+      BorrowPlyPerWeek: new TokenAmount(
+        PLYToken,
+        rewardSpeeds!.plyRewardBorrowSpeed.mul(ONE_DAY).mul(7).toString()
+      ),
     };
   }
 

package/src/SDK.ts

@@ -1,25 +1,30 @@
-import AuriFairLaunchABI from "@aurigami/contracts/artifacts/contracts/AuriFairLaunch.sol/AuriFairLaunch.json";
-import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json';
-import ComptrollerABI from '@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json';
-import FaucetABI from "@aurigami/contracts/artifacts/contracts/mock/Faucet.sol/Faucet.json";
-import TokenLockABI from "@aurigami/contracts/artifacts/contracts/TokenLock.sol/TokenLock.json";
-import { AuriFairLaunch, AuriLens, Comptroller, TokenLock } from '@aurigami/contracts/typechain';
-import { TransactionResponse } from '@ethersproject/abstract-provider';
-import BigNumber from 'bignumber.js';
-import { BigNumber as BN, Contract } from 'ethers';
 import { BlockchainEntity, BlockchainEntityRead } from './BlockchainEntity';
-import { AurPlyPid, BORROW_LIMIT_BUFFER, DECIMAL_PRECISION, networkAddresses, ONE_DAY, REWARDCLAIMSTART } from './constants';
-import { calcLMRewardApr, decimalFactor, getCurrentTimestamp, isSameAddress } from './helpers';
-import { MoneyMarketRead } from './MoneyMarket';
-import { calcValuation, fetchPrice, fetchValuation } from './priceFetcher';
-import { AURPLYToken, PLYToken, Token } from './token';
-import { TokenAmount } from './tokenAmount';
 import {
+  LockingDetails,
+  PlyAuroraPoolDetails,
+  NetworkConnection,
+  UserDetails,
+  UserMarketDetails,
   Address,
   CurrencyAmount,
-  HypotheticalStats, LockingDetails, MarketAction, NetworkConnection, PlyAuroraPoolDetails, UserDetails,
-  UserMarketDetails
+  HypotheticalStats,
+  MarketAction
 } from './types';
+import { networkAddresses, BORROW_LIMIT_BUFFER, DECIMAL_PRECISION, REWARDCLAIMSTART, ONE_DAY, AurPlyPid } from './constants';
+import { TransactionResponse } from '@ethersproject/abstract-provider';
+import { Contract, BigNumber as BN, ethers, providers } from 'ethers';
+import { isSameAddress, decimalFactor, getCurrentTimestamp, calcLMRewardApr } from './helpers';
+import { MoneyMarketRead } from './MoneyMarket';
+import { fetchValuation, fetchPrice, calcValuation } from './priceFetcher';
+import { AuriFairLaunch, Comptroller, TokenLock, AuriLens } from '@aurigami/contracts/typechain';
+import { TokenAmount } from './tokenAmount';
+import { AURPLYToken, PLYToken, Token } from './token';
+import BigNumber from 'bignumber.js';
+import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json';
+import ComptrollerABI from '@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json';
+import TokenLockABI from "@aurigami/contracts/artifacts/contracts/TokenLock.sol/TokenLock.json";
+import AuriFairLaunchABI from "@aurigami/contracts/artifacts/contracts/AuriFairLaunch.sol/AuriFairLaunch.json";
+import FaucetABI from "@aurigami/contracts/artifacts/contracts/mock/Faucet.sol/Faucet.json";
 
 export class SdkRead extends BlockchainEntityRead {
 
@@ -92,9 +97,14 @@ export class SdkRead extends BlockchainEntityRead {
       return p;
     }, new BigNumber(0))
 
-    var accountLiquidity: [BN, BN];
+    promises = new Array(3);
+    var accountLiquidity: [BN, BN], rewardBalancesMetadata, lockedAmount: BN;
+    promises[0] = this._comptroller.getAccountLiquidity(userAddress);
+    promises[1] = this._auriLens.callStatic.claimAndGetRewardBalancesMetadata(this._comptroller.address, this._auriFairLaunch.address, [], {from: userAddress});
+    promises[2] = this._tokenLock.lockedAmounts(userAddress);
+    var values = await Promise.all(promises);
 
-    accountLiquidity = await this._comptroller.getAccountLiquidity(userAddress);
+    accountLiquidity = values[0]; rewardBalancesMetadata = values[1]; lockedAmount = values[2];
     var borrowedvaluation: BigNumber = totalBorrowLimit.minus(new BigNumber(accountLiquidity[0].toString()).div(decimalFactor(18)));
 
     if (borrowedvaluation.lt("0.00001")) { // Igore dust, dust could be the result of network delay causing collateral valuation calc to be different on vs off chain
@@ -129,13 +139,13 @@ export class SdkRead extends BlockchainEntityRead {
     }
 
     return {
-      markets: [],
+      markets: userMarketDetails,
       borrowLimit: {
         currency: "USD",
         amount: bufferedBorrowLimit.toFixed(DECIMAL_PRECISION)
       },
-      accruedPly: new TokenAmount(PLYToken, "0"),
-      lockedPly: new TokenAmount(PLYToken, "0"),
+      accruedPly: new TokenAmount(PLYToken, rewardBalancesMetadata.plyAccrued.toString()),
+      lockedPly: new TokenAmount(PLYToken, lockedAmount.toString()),
       borrowableAmount: {
         currency: "USD",
         amount: borrowableAmount.toFixed(DECIMAL_PRECISION)

package/src/constants.ts

@@ -47,6 +47,16 @@ export const networkAddresses: NetworkAddresses = {
       name: "auWNEAR",
       address: '0xaE4fac24dCdAE0132C6d04f564dCf059616E9423'.toLowerCase(),
       underlying: '0xC42C30aC6Cc15faC9bD938618BcaA1a1FaE8501d'.toLowerCase()
+    },
+    {
+      name: "auSTNEAR",
+      address: "0x3195949f267702723bc614cAE037cdc8D1E94786".toLowerCase(),
+      underlying: '0x07f9f7f963c5cd2bbffd30ccfb964be114332e30'.toLowerCase()
+    },
+    {
+      name: "auAURORA",
+      address: "0x8888682E24dd4Df7B7Ff2B91fccB575737E433bf".toLowerCase(),
+      underlying: "0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase(),
     }
   ],
   misc: {
@@ -60,6 +70,7 @@ export const networkAddresses: NetworkAddresses = {
   tokens: {
     AURORA: "0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase(),
     PLY: "0x981bD5832EAB9C8F607940E0e9faCBf8C09ee20a".toLowerCase(),
+    stNEAR: "0x07f9f7f963c5cd2bbffd30ccfb964be114332e30".toLowerCase(),
     AURPLY: dummyAddress.toLowerCase() // This is dummy
   }
 }

package/src/priceFetcher.ts

@@ -1,5 +1,5 @@
 import BigNumber from "bignumber.js";
-import { Contract, providers, BigNumber as BN } from "ethers";
+import { Contract, providers, BigNumber as BN, ethers } from "ethers";
 import { networkAddresses } from "./constants";
 import OracleABI from "./abis/Oracle.json";
 import { isSameAddress, decimalFactor, getDecimal } from "./helpers";
@@ -21,11 +21,11 @@ export async function fetchPriceFromCoingeckoAPI(id: string): Promise<BigNumber>
     return new BigNumber(price[id].usd)
 }
 
-export async function fetchPriceFromCoingecko(address: Address): Promise<BigNumber> {
-    if (isSameAddress(address, networkAddresses.tokens.AURORA)) {
+export async function fetchPriceFromCoingecko(id: Address): Promise<BigNumber> {
+    if (isSameAddress(id, networkAddresses.tokens.AURORA)) {
         return fetchPriceFromCoingeckoAPI('aurora-near');
     } else {
-        throw Error(`Unknown token ${address} in fetchPriceFromCoingecko`);
+        throw Error(`Unknown token ${id} in fetchPriceFromCoingecko`);
     }
 }
 
@@ -94,8 +94,20 @@ export async function fetchUnderlyingTokensPrices(provider: providers.Provider):
     })
 }
 
+export async function fetchStNEARPrice(): Promise<BigNumber> {
+    const ratioPromise = axios.get("https://validators.narwallets.com/metrics_json").then((res) => res.data);
+    const nearPricePromise = fetchPriceFromCoingeckoAPI('near');
+    const [ratioRes, nearPrice]: [any, BigNumber] = await Promise.all([ratioPromise, nearPricePromise]);
+    const ratio = new BigNumber(ratioRes.st_near_price);
+    return ratio.multipliedBy(nearPrice)
+}
+
 export async function fetchPrice(address: Address, provider: providers.Provider): Promise<BigNumber> {
     if (hardcodePLYPrice && isSameAddress(address, networkAddresses.tokens.PLY)) return new BigNumber(0);
+    
+    if (isSameAddress(address, networkAddresses.tokens.stNEAR)) return fetchStNEARPrice();
+    if (isSameAddress(address, networkAddresses.tokens.AURORA)) return fetchPriceFromCoingecko(address);
+
     const matchingAuToken = networkAddresses.auTokens.find((auToken) => {
         return isSameAddress(auToken.underlying, address)
     });

package/src/types.ts

@@ -26,6 +26,8 @@ export type MoneyMarketDetails = {
   borrowApy: number;
   borrowPlyApy: number;
   collateralRatio: number;
+  depositPlyPerWeek: TokenAmount;
+  BorrowPlyPerWeek: TokenAmount;
 };
 
 export type UserDetails = {