@aurigami/sdk 1.0.3-fix → 1.0.3

package/dist/SDK.d.ts

@@ -1,9 +1,9 @@
-import { AuriFairLaunch, AuriLens, Comptroller, TokenLock } from '@aurigami/contracts/typechain';
-import { TransactionResponse } from '@ethersproject/abstract-provider';
 import { BlockchainEntity, BlockchainEntityRead } from './BlockchainEntity';
-import { Token } from './token';
+import { LockingDetails, PlyAuroraPoolDetails, NetworkConnection, UserDetails, UserMarketDetails, CurrencyAmount, HypotheticalStats, MarketAction } from './types';
+import { TransactionResponse } from '@ethersproject/abstract-provider';
+import { AuriFairLaunch, Comptroller, TokenLock, AuriLens } from '@aurigami/contracts/typechain';
 import { TokenAmount } from './tokenAmount';
-import { CurrencyAmount, HypotheticalStats, LockingDetails, MarketAction, NetworkConnection, PlyAuroraPoolDetails, UserDetails, UserMarketDetails } from './types';
+import { Token } from './token';
 export declare class SdkRead extends BlockchainEntityRead {
     protected _comptroller: Comptroller;
     protected _tokenLock: TokenLock;

package/dist/sdk.cjs.development.js

@@ -7,16 +7,16 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var BigNumber = _interopDefault(require('bignumber.js'));
 var ethers = require('ethers');
 var utils = require('ethers/lib/utils');
-var AuriFairLaunchABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuriFairLaunch.sol/AuriFairLaunch.json'));
-var AuriLensABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json'));
-var ComptrollerABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json'));
-var FaucetABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/mock/Faucet.sol/Faucet.json'));
-var TokenLockABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/TokenLock.sol/TokenLock.json'));
 var abstractSigner = require('@ethersproject/abstract-signer');
 var AuErc20ABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuErc20.sol/AuErc20.json'));
 var AuETHABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuETH.sol/AuETH.json'));
+var ComptrollerABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json'));
+var AuriLensABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json'));
 var EthRepayHelperABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/EthRepayHelper.sol/EthRepayHelper.json'));
 var axios = _interopDefault(require('axios'));
+var TokenLockABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/TokenLock.sol/TokenLock.json'));
+var AuriFairLaunchABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuriFairLaunch.sol/AuriFairLaunch.json'));
+var FaucetABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/mock/Faucet.sol/Faucet.json'));
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -900,6 +900,20 @@ var BlockchainEntity = /*#__PURE__*/function () {
   return BlockchainEntity;
 }();
 
+(function (ComptrollerRewardType) {
+  ComptrollerRewardType[ComptrollerRewardType["PLY"] = 0] = "PLY";
+  ComptrollerRewardType[ComptrollerRewardType["AURORA"] = 1] = "AURORA";
+})(exports.ComptrollerRewardType || (exports.ComptrollerRewardType = {}));
+
+(function (MarketAction) {
+  MarketAction[MarketAction["Deposit"] = 0] = "Deposit";
+  MarketAction[MarketAction["Borrow"] = 1] = "Borrow";
+  MarketAction[MarketAction["Withdraw"] = 2] = "Withdraw";
+  MarketAction[MarketAction["Repay"] = 3] = "Repay";
+  MarketAction[MarketAction["EnableCollateral"] = 4] = "EnableCollateral";
+  MarketAction[MarketAction["DisableCollateral"] = 5] = "DisableCollateral";
+})(exports.MarketAction || (exports.MarketAction = {}));
+
 var dummyAddress = "0xDEADbeEfEEeEEEeEEEeEEeeeeeEeEEeeeeEEEEeE";
 var ETHAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 var AURORA_CHAINID = 1313161554;
@@ -1015,20 +1029,6 @@ function calcLMRewardApr(rewardsValue, totalStakeValue, frequencyPerYear) {
   return rewardsValue.multipliedBy(frequencyPerYear).dividedBy(totalStakeValue);
 }
 
-(function (ComptrollerRewardType) {
-  ComptrollerRewardType[ComptrollerRewardType["PLY"] = 0] = "PLY";
-  ComptrollerRewardType[ComptrollerRewardType["AURORA"] = 1] = "AURORA";
-})(exports.ComptrollerRewardType || (exports.ComptrollerRewardType = {}));
-
-(function (MarketAction) {
-  MarketAction[MarketAction["Deposit"] = 0] = "Deposit";
-  MarketAction[MarketAction["Borrow"] = 1] = "Borrow";
-  MarketAction[MarketAction["Withdraw"] = 2] = "Withdraw";
-  MarketAction[MarketAction["Repay"] = 3] = "Repay";
-  MarketAction[MarketAction["EnableCollateral"] = 4] = "EnableCollateral";
-  MarketAction[MarketAction["DisableCollateral"] = 5] = "DisableCollateral";
-})(exports.MarketAction || (exports.MarketAction = {}));
-
 var Token = function Token(address, decimals) {
   this.address = address.toLowerCase();
   this.decimals = decimals;
@@ -3012,7 +3012,7 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     var _getUserDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(userAddress) {
       var _this2 = this;
 
-      var marketCount, userMarketDetails, assetsIn, promises, totalBorrowLimit, pricePromises, _loop2, _iterator, _step, underlyingPrices, depositValues, _loop, i, accountLiquidity, borrowedvaluation, bufferedBorrowLimit, minimumBorrowLimitAllowed, borrowableAmount, auToken, moneyMarket, borrowLimitMargin, maxWithdrawCap;
+      var marketCount, userMarketDetails, assetsIn, promises, totalBorrowLimit, pricePromises, _loop2, _iterator, _step, underlyingPrices, depositValues, _loop, i, accountLiquidity, rewardBalancesMetadata, lockedAmount, values, borrowedvaluation, bufferedBorrowLimit, minimumBorrowLimitAllowed, borrowableAmount, auToken, moneyMarket, borrowLimitMargin, maxWithdrawCap;
 
       return runtime_1.wrap(function _callee2$(_context2) {
         while (1) {
@@ -3085,11 +3085,20 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 if (userMarketDetails[index].isCollateral) return p.plus(v.multipliedBy(userMarketDetails[index].collateralRatio));
                 return p;
               }, new BigNumber(0));
-              _context2.next = 19;
-              return this._comptroller.getAccountLiquidity(userAddress);
+              promises = new Array(3);
+              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);
+              _context2.next = 23;
+              return Promise.all(promises);
 
-            case 19:
-              accountLiquidity = _context2.sent;
+            case 23:
+              values = _context2.sent;
+              accountLiquidity = values[0];
+              rewardBalancesMetadata = values[1];
+              lockedAmount = values[2];
               borrowedvaluation = totalBorrowLimit.minus(new BigNumber(accountLiquidity[0].toString()).div(decimalFactor(18)));
 
               if (borrowedvaluation.lt("0.00001")) {
@@ -3114,20 +3123,20 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
               }
 
               return _context2.abrupt("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)
                 }
               });
 
-            case 27:
+            case 34:
             case "end":
               return _context2.stop();
           }