@aurigami/sdk 1.0.3-fix → 1.0.3

package/dist/sdk.esm.js

@@ -1,16 +1,16 @@
 import BigNumber from 'bignumber.js';
 import { BigNumber as BigNumber$1, utils, Contract, ethers } from 'ethers';
 import { Logger } from 'ethers/lib/utils';
-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 { Signer } from '@ethersproject/abstract-signer';
 import AuErc20ABI from '@aurigami/contracts/artifacts/contracts/AuErc20.sol/AuErc20.json';
 import AuETHABI from '@aurigami/contracts/artifacts/contracts/AuETH.sol/AuETH.json';
+import ComptrollerABI from '@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json';
+import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json';
 import EthRepayHelperABI from '@aurigami/contracts/artifacts/contracts/EthRepayHelper.sol/EthRepayHelper.json';
 import axios from 'axios';
+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';
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -894,6 +894,23 @@ var BlockchainEntity = /*#__PURE__*/function () {
   return BlockchainEntity;
 }();
 
+var ComptrollerRewardType;
+
+(function (ComptrollerRewardType) {
+  ComptrollerRewardType[ComptrollerRewardType["PLY"] = 0] = "PLY";
+  ComptrollerRewardType[ComptrollerRewardType["AURORA"] = 1] = "AURORA";
+})(ComptrollerRewardType || (ComptrollerRewardType = {}));
+var MarketAction;
+
+(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";
+})(MarketAction || (MarketAction = {}));
+
 var dummyAddress = "0xDEADbeEfEEeEEEeEEEeEEeeeeeEeEEeeeeEEEEeE";
 var ETHAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 var AURORA_CHAINID = 1313161554;
@@ -1009,23 +1026,6 @@ function calcLMRewardApr(rewardsValue, totalStakeValue, frequencyPerYear) {
   return rewardsValue.multipliedBy(frequencyPerYear).dividedBy(totalStakeValue);
 }
 
-var ComptrollerRewardType;
-
-(function (ComptrollerRewardType) {
-  ComptrollerRewardType[ComptrollerRewardType["PLY"] = 0] = "PLY";
-  ComptrollerRewardType[ComptrollerRewardType["AURORA"] = 1] = "AURORA";
-})(ComptrollerRewardType || (ComptrollerRewardType = {}));
-var MarketAction;
-
-(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";
-})(MarketAction || (MarketAction = {}));
-
 var Token = function Token(address, decimals) {
   this.address = address.toLowerCase();
   this.decimals = decimals;
@@ -3009,7 +3009,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) {
@@ -3082,11 +3082,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")) {
@@ -3111,20 +3120,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();
           }