@aurigami/sdk 1.0.3-fix → 1.0.3

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3-fix",
+  "version": "1.0.3",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

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)