@aurigami/sdk 0.3.1 → 0.3.5

package/dist/priceFetcher.d.ts

@@ -13,6 +13,9 @@ export declare function fetchLPPositions(LPAddress: Address, provider: providers
 }>;
 export declare function fetchLPPrice(address: Address, provider: providers.Provider): Promise<BigNumber>;
 export declare function fetchPriceFromOracle(auTokenAddress: Address, underlyingDecimal: number, provider: providers.Provider): Promise<BigNumber>;
-export declare function fetchUnderlyingTokensPrices(provider: providers.Provider): Promise<any>;
+export declare function fetchUnderlyingTokensPrices(provider: providers.Provider): Promise<{
+    auToken: string;
+    underlyingPrice: BigNumber;
+}[]>;
 export declare function fetchPrice(address: Address, provider: providers.Provider): Promise<BigNumber>;
 export declare function fetchValuation(tokenAmount: TokenAmount, provider: providers.Provider, price?: BigNumber): Promise<BigNumber>;

package/dist/sdk.cjs.development.js

@@ -2009,12 +2009,6 @@ var IUniswapV2PairABI = {
 	deployedLinkReferences: deployedLinkReferences
 };
 
-var abi$2 = [
-];
-var dummyABI = {
-	abi: abi$2
-};
-
 var axios = /*#__PURE__*/require('axios');
 
 function fetchPriceFromCoingeckoAPI(_x) {
@@ -2214,7 +2208,7 @@ function _fetchUnderlyingTokensPrices() {
       while (1) {
         switch (_context6.prev = _context6.next) {
           case 0:
-            auriLens = new ethers$1.Contract(networkAddresses.misc.AURILENS, dummyABI.abi, provider);
+            auriLens = new ethers$1.Contract(networkAddresses.misc.AURILENS, AuriLensABI.abi, provider);
             auTokenAddresses = networkAddresses.auTokens.map(function (auToken) {
               return auToken.address;
             });
@@ -2956,11 +2950,10 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              console.log(this._networkConnection.provider);
-              _context.next = 3;
+              _context.next = 2;
               return getCurrentTimestamp(this._networkConnection.provider);
 
-            case 3:
+            case 2:
               currentTime = _context.sent;
               currentWeek = ethers$1.BigNumber.from(currentTime - REWARDCLAIMSTART).div(7 * ONE_DAY).toNumber();
               denominator = 10000;
@@ -2969,14 +2962,14 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
               promises.push(this._tokenLock.percentageLock(currentWeek + 1)["catch"](function (err) {
                 return denominator;
               }));
-              _context.next = 11;
+              _context.next = 10;
               return Promise.all(promises).then(function (res) {
                 return res.map(function (v) {
                   return v.toString();
                 });
               });
 
-            case 11:
+            case 10:
               values = _context.sent;
               return _context.abrupt("return", {
                 vestingStart: REWARDCLAIMSTART,
@@ -2984,7 +2977,7 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 nextUnlockPortion: new BigNumber(denominator).minus(values[1]).div(denominator).toNumber()
               });
 
-            case 13:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -3003,7 +2996,7 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     var _getUserDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(userAddress) {
       var _this2 = this;
 
-      var marketCount, userMarketDetails, assetsIn, collateralRatio, promises, totalBorrowLimit, pricePromises, _loop2, _iterator, _step, underlyingPrices, depositValuationPromises, _loop, i, depositValues, accountLiquidity, rewardBalancesMetadata, lockedAmount, values, borrowedvaluation, bufferedBorrowLimit, borrowableAmount, auToken, moneyMarket;
+      var marketCount, userMarketDetails, assetsIn, promises, totalBorrowLimit, pricePromises, _loop2, _iterator, _step, underlyingPrices, depositValuationPromises, _loop, i, depositValues, accountLiquidity, rewardBalancesMetadata, lockedAmount, values, borrowedvaluation, bufferedBorrowLimit, minimumBorrowLimitAllowed, borrowableAmount, auToken, moneyMarket, maxWithdrawCap;
 
       return runtime_1.wrap(function _callee2$(_context2) {
         while (1) {
@@ -3011,7 +3004,6 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
             case 0:
               marketCount = networkAddresses.auTokens.length;
               userMarketDetails = [];
-              collateralRatio = new Array(marketCount);
               promises = [];
               totalBorrowLimit = new BigNumber(0);
               pricePromises = [];
@@ -3029,7 +3021,7 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                   userMarketDetail.borrowBalance = res;
                 }));
                 promises.push(moneyMarket.getCollateralRatio().then(function (res) {
-                  collateralRatio[i] = res;
+                  userMarketDetail.collateralRatio = res.toNumber();
                 }));
                 pricePromises.push(fetchPrice(moneyMarket.underlying.address, _this2._networkConnection.provider));
               };
@@ -3041,24 +3033,26 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
               promises.push(this._comptroller.getAssetsIn(userAddress).then(function (res) {
                 assetsIn = res;
               }));
-              _context2.next = 11;
+              _context2.next = 10;
               return Promise.all(promises);
 
-            case 11:
-              _context2.next = 13;
+            case 10:
+              _context2.next = 12;
               return Promise.all(pricePromises);
 
-            case 13:
+            case 12:
               underlyingPrices = _context2.sent;
               depositValuationPromises = [];
 
               _loop = function _loop() {
                 var auToken = networkAddresses.auTokens[i];
 
-                if (assetsIn.filter(function (auAddress) {
-                  isSameAddress(auToken.address, auAddress);
-                }).length > 0) {
+                if (assetsIn.find(function (auAddress) {
+                  return isSameAddress(auToken.address, auAddress);
+                }) !== undefined) {
                   userMarketDetails[i].isCollateral = true;
+                } else {
+                  userMarketDetails[i].isCollateral = false;
                 }
 
                 depositValuationPromises.push(fetchValuation(userMarketDetails[i].depositBalance, _this2._networkConnection.provider, underlyingPrices[i]));
@@ -3068,29 +3062,30 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 _loop();
               }
 
-              _context2.next = 19;
+              _context2.next = 18;
               return Promise.all(depositValuationPromises);
 
-            case 19:
+            case 18:
               depositValues = _context2.sent;
               totalBorrowLimit = depositValues.reduce(function (p, v, index) {
-                if (userMarketDetails[index].isCollateral) return p.plus(v.multipliedBy(collateralRatio[index]));
+                if (userMarketDetails[index].isCollateral) return p.plus(v.multipliedBy(userMarketDetails[index].collateralRatio));
                 return p;
-              });
+              }, new BigNumber(0));
               promises = [];
               promises.push(this._comptroller.getAccountLiquidity(userAddress));
               promises.push(this._auriLens.callStatic.getRewardBalancesMetadata(this._comptroller.address, this._auriFairLaunch.address, userAddress, [AurPlyPid]));
               promises.push(this._tokenLock.lockedAmounts(userAddress));
-              _context2.next = 27;
+              _context2.next = 26;
               return Promise.all(promises);
 
-            case 27:
+            case 26:
               values = _context2.sent;
               accountLiquidity = values[0];
               rewardBalancesMetadata = values[1];
               lockedAmount = values[2];
               borrowedvaluation = totalBorrowLimit.minus(new BigNumber(accountLiquidity[1].toString()).div(decimalFactor(18)));
               bufferedBorrowLimit = totalBorrowLimit.multipliedBy(BORROW_LIMIT_BUFFER);
+              minimumBorrowLimitAllowed = borrowedvaluation.div(BORROW_LIMIT_BUFFER);
 
               if (bufferedBorrowLimit.lte(borrowedvaluation)) {
                 borrowableAmount = new BigNumber(0);
@@ -3101,7 +3096,8 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
               for (i = 0; i < marketCount; i++) {
                 auToken = networkAddresses.auTokens[i];
                 moneyMarket = new MoneyMarketRead(this._networkConnection, auToken.address, auToken.underlying);
-                userMarketDetails[i].maxWithdrawableAmount = new TokenAmount(moneyMarket.underlying, borrowableAmount.div(underlyingPrices[i]).toFixed(18));
+                maxWithdrawCap = totalBorrowLimit.minus(minimumBorrowLimitAllowed).div(userMarketDetails[i].collateralRatio).div(underlyingPrices[i]);
+                userMarketDetails[i].maxWithdrawableAmount = userMarketDetails[i].isCollateral && maxWithdrawCap.lt(userMarketDetails[i].depositBalance.formattedAmount()) ? new TokenAmount(moneyMarket.underlying, maxWithdrawCap.toFixed(24), false) : new TokenAmount(moneyMarket.underlying, userMarketDetails[i].depositBalance.rawAmount());
               }
 
               return _context2.abrupt("return", {
@@ -3356,7 +3352,8 @@ var dummyUserMarketDetails = {
   depositBalance: dummyTokenAmount2,
   borrowBalance: dummyZeroTokenAmount,
   isCollateral: true,
-  maxWithdrawableAmount: dummyTokenAmount
+  maxWithdrawableAmount: dummyTokenAmount,
+  collateralRatio: 0.5
 };
 
 exports.AURORA_CHAINID = AURORA_CHAINID;