@aurigami/sdk 1.12.9-hf → 1.13.0

package/dist/sdk.esm.js

@@ -22,6 +22,7 @@ export { default as MAINNET_ADDRESSES } from '@aurigami/contracts/deployments/au
 export { default as TESTNET_ADDRESSES } from '@aurigami/contracts/deployments/aurora_testnet.json';
 import axios from 'axios';
 import { Signer } from '@ethersproject/abstract-signer';
+import { __decorate, __metadata } from 'tslib';
 
 
 
@@ -191,6 +192,7 @@ var REFERRAL_CAMPAIGNS = /*#__PURE__*/Object.fromEntries([['referral-2505', {
   start: 1654696800,
   end: 1655301599
 }]]);
+var CACHE_TIMEOUT = 10 * 1000; // 10 seconds
 
 var decimalRecords = {
   '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee': 18,
@@ -1279,6 +1281,9 @@ function calcLMRewardApr(rewardsValue, totalStakeValue, frequencyPerYear) {
 
   return rewardsValue.multipliedBy(frequencyPerYear).dividedBy(totalStakeValue);
 }
+function calcNetApy(suppliedValue, supplyApy, borrowedValue, borrowApy) {
+  return suppliedValue.multipliedBy(supplyApy).minus(borrowedValue.multipliedBy(borrowApy));
+}
 function getBlockTimestamp(_x2, _x3) {
   return _getBlockTimestamp.apply(this, arguments);
 }
@@ -1530,6 +1535,36 @@ function sortEvents(events) {
     return a.blockNumber - b.blockNumber;
   });
 }
+function Cache(cacheTimeout) {
+  return function (target, propertyKey, descriptor) {
+    var originalMethod = descriptor.value;
+    var cache = new Map();
+
+    descriptor.value = function () {
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+
+      var key = JSON.stringify(args);
+
+      if (cache.has(key)) {
+        var _cache$get = cache.get(key),
+            timestamp = _cache$get[0],
+            value = _cache$get[1];
+
+        if (Date.now() - timestamp < cacheTimeout) {
+          return value;
+        }
+      }
+
+      var result = originalMethod.apply(this, args);
+      cache.set(key, [Date.now(), result]);
+      return result;
+    };
+
+    return descriptor;
+  };
+}
 
 var BlockchainEntityRead = function BlockchainEntityRead(networkConnection) {
   this._networkConnection = networkConnection;
@@ -2040,31 +2075,31 @@ function fetchLPPositions(_x5, _x6) {
 
 function _fetchLPPositions() {
   _fetchLPPositions = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5(LPAddress, provider) {
-    var LPContract, promises, values;
+    var LPContract, _yield$Promise$all, token0, token1, reserves, totalSupply;
+
     return runtime_1.wrap(function _callee5$(_context5) {
       while (1) {
         switch (_context5.prev = _context5.next) {
           case 0:
             LPContract = new Contract(LPAddress, IUniswapV2PairABI.abi, provider);
-            promises = [];
-            promises.push(LPContract.token0());
-            promises.push(LPContract.token1());
-            promises.push(LPContract.getReserves());
-            promises.push(LPContract.totalSupply());
-            _context5.next = 8;
-            return Promise.all(promises);
+            _context5.next = 3;
+            return Promise.all([LPContract.token0(), LPContract.token1(), LPContract.getReserves(), LPContract.totalSupply()]);
 
-          case 8:
-            values = _context5.sent;
+          case 3:
+            _yield$Promise$all = _context5.sent;
+            token0 = _yield$Promise$all[0];
+            token1 = _yield$Promise$all[1];
+            reserves = _yield$Promise$all[2];
+            totalSupply = _yield$Promise$all[3];
             return _context5.abrupt("return", {
-              token0: values[0],
-              token1: values[1],
-              reserve0: values[2].reserve0,
-              reserve1: values[2].reserve1,
-              totalSupply: values[3]
+              token0: token0,
+              token1: token1,
+              reserve0: reserves.reserve0,
+              reserve1: reserves.reserve1,
+              totalSupply: totalSupply
             });
 
-          case 10:
+          case 9:
           case "end":
             return _context5.stop();
         }
@@ -2187,7 +2222,7 @@ function fetchStNEARPrice() {
 
 function _fetchStNEARPrice() {
   _fetchStNEARPrice = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8() {
-    var ratioPromise, nearPricePromise, _yield$Promise$all, ratioRes, nearPrice, ratio;
+    var ratioPromise, nearPricePromise, _yield$Promise$all2, ratioRes, nearPrice, ratio;
 
     return runtime_1.wrap(function _callee8$(_context8) {
       while (1) {
@@ -2201,9 +2236,9 @@ function _fetchStNEARPrice() {
             return Promise.all([ratioPromise, nearPricePromise]);
 
           case 4:
-            _yield$Promise$all = _context8.sent;
-            ratioRes = _yield$Promise$all[0];
-            nearPrice = _yield$Promise$all[1];
+            _yield$Promise$all2 = _context8.sent;
+            ratioRes = _yield$Promise$all2[0];
+            nearPrice = _yield$Promise$all2[1];
             ratio = new BigNumber(ratioRes.st_near_price);
             return _context8.abrupt("return", ratio.multipliedBy(nearPrice));
 
@@ -3056,12 +3091,14 @@ var helpers = {
   getSymbol: getSymbol,
   getUnderlying: getUnderlying,
   calcLMRewardApr: calcLMRewardApr,
+  calcNetApy: calcNetApy,
   getBlockTimestamp: getBlockTimestamp,
   getBlocksTimestampViaRPC: getBlocksTimestampViaRPC,
   getBlocksTimestamp: getBlocksTimestamp,
   getBlockBeforeTimestamp: getBlockBeforeTimestamp,
   devLog: devLog,
   sortEvents: sortEvents,
+  Cache: Cache,
   fetchPriceFromDefiLlamaAPI: fetchPriceFromDefiLlamaAPI,
   fetchPriceFromCoingeckoAPI: fetchPriceFromCoingeckoAPI,
   fetchPriceFromDefiLlama: fetchPriceFromDefiLlama,
@@ -3276,26 +3313,72 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
 
   var _proto = MoneyMarketRead.prototype;
 
-  _proto.getRewardSpeeds = /*#__PURE__*/function () {
-    var _getRewardSpeeds = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee() {
-      var speeds;
+  _proto.getUnderlyingPrice = /*#__PURE__*/function () {
+    var _getUnderlyingPrice = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee() {
       return runtime_1.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              return _context.abrupt("return", fetchPrice(this.underlying.address, this._networkConnection.provider));
+
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    function getUnderlyingPrice() {
+      return _getUnderlyingPrice.apply(this, arguments);
+    }
+
+    return getUnderlyingPrice;
+  }();
+
+  _proto.getPlyPrice = /*#__PURE__*/function () {
+    var _getPlyPrice = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2() {
+      return runtime_1.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", fetchPrice(networkAddresses.tokens.PLY, this._networkConnection.provider));
+
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, this);
+    }));
+
+    function getPlyPrice() {
+      return _getPlyPrice.apply(this, arguments);
+    }
+
+    return getPlyPrice;
+  }();
+
+  _proto.getRewardSpeeds = /*#__PURE__*/function () {
+    var _getRewardSpeeds = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3() {
+      var speeds;
+      return runtime_1.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
               return this.env.auriLens.getRewardSpeeds(this.env.comptroller.address, this.auToken.address);
 
             case 2:
-              speeds = _context.sent;
-              return _context.abrupt("return", speeds);
+              speeds = _context3.sent;
+              return _context3.abrupt("return", speeds);
 
             case 4:
             case "end":
-              return _context.stop();
+              return _context3.stop();
           }
         }
-      }, _callee, this);
+      }, _callee3, this);
     }));
 
     function getRewardSpeeds() {
@@ -3306,26 +3389,26 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getTotalTokenBorrowed = /*#__PURE__*/function () {
-    var _getTotalTokenBorrowed = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2() {
-      return runtime_1.wrap(function _callee2$(_context2) {
+    var _getTotalTokenBorrowed = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee4() {
+      return runtime_1.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
-              _context2.t0 = TokenAmount;
-              _context2.t1 = this.underlying;
-              _context2.next = 4;
+              _context4.t0 = TokenAmount;
+              _context4.t1 = this.underlying;
+              _context4.next = 4;
               return this.auToken.totalBorrows();
 
             case 4:
-              _context2.t2 = _context2.sent.toString();
-              return _context2.abrupt("return", new _context2.t0(_context2.t1, _context2.t2));
+              _context4.t2 = _context4.sent.toString();
+              return _context4.abrupt("return", new _context4.t0(_context4.t1, _context4.t2));
 
             case 6:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
         }
-      }, _callee2, this);
+      }, _callee4, this);
     }));
 
     function getTotalTokenBorrowed() {
@@ -3336,33 +3419,28 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getTotalTokenDeposited = /*#__PURE__*/function () {
-    var _getTotalTokenDeposited = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3() {
-      var _this2 = this;
+    var _getTotalTokenDeposited = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5() {
+      var _yield$Promise$all, totalBorrow, totalCash;
 
-      var promises, totalBorrow, totalCash;
-      return runtime_1.wrap(function _callee3$(_context3) {
+      return runtime_1.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
-              promises = [];
-              promises.push(this.getTotalTokenBorrowed().then(function (res) {
-                totalBorrow = res;
-              }));
-              promises.push(this.auToken.getCash().then(function (res) {
-                totalCash = new TokenAmount(_this2.underlying, res.toString());
-              }));
-              _context3.next = 5;
-              return Promise.all(promises);
+              _context5.next = 2;
+              return Promise.all([this.getTotalTokenBorrowed(), this.auToken.getCash()]);
 
-            case 5:
-              return _context3.abrupt("return", new TokenAmount(this.underlying, BigNumber$1.from(totalCash.rawAmount()).add(totalBorrow.rawAmount()).toString()));
+            case 2:
+              _yield$Promise$all = _context5.sent;
+              totalBorrow = _yield$Promise$all[0];
+              totalCash = _yield$Promise$all[1];
+              return _context5.abrupt("return", new TokenAmount(this.underlying, BigNumber$1.from(new TokenAmount(this.underlying, totalCash.toString()).rawAmount()).add(totalBorrow.rawAmount()).toString()));
 
             case 6:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
         }
-      }, _callee3, this);
+      }, _callee5, this);
     }));
 
     function getTotalTokenDeposited() {
@@ -3373,26 +3451,26 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getDepositAPY = /*#__PURE__*/function () {
-    var _getDepositAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee4() {
+    var _getDepositAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6() {
       var supplyRatePerTimestamp, supplyRatePerDay;
-      return runtime_1.wrap(function _callee4$(_context4) {
+      return runtime_1.wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
-              _context4.next = 2;
+              _context6.next = 2;
               return this.auToken.supplyRatePerTimestamp();
 
             case 2:
-              supplyRatePerTimestamp = _context4.sent;
+              supplyRatePerTimestamp = _context6.sent;
               supplyRatePerDay = new BigNumber(supplyRatePerTimestamp.toString()).multipliedBy(ONE_DAY).div(decimalFactor(18));
-              return _context4.abrupt("return", new BigNumber(supplyRatePerDay.plus(1)).pow(365).minus(1));
+              return _context6.abrupt("return", new BigNumber(supplyRatePerDay.plus(1)).pow(365).minus(1));
 
             case 5:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
         }
-      }, _callee4, this);
+      }, _callee6, this);
     }));
 
     function getDepositAPY() {
@@ -3403,26 +3481,26 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getBorrowAPY = /*#__PURE__*/function () {
-    var _getBorrowAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5() {
+    var _getBorrowAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7() {
       var borrowRatePerTimestamp, borrowRatePerDay;
-      return runtime_1.wrap(function _callee5$(_context5) {
+      return runtime_1.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
-              _context5.next = 2;
+              _context7.next = 2;
               return this.auToken.borrowRatePerTimestamp();
 
             case 2:
-              borrowRatePerTimestamp = _context5.sent;
+              borrowRatePerTimestamp = _context7.sent;
               borrowRatePerDay = new BigNumber(borrowRatePerTimestamp.toString()).multipliedBy(ONE_DAY).div(decimalFactor(18));
-              return _context5.abrupt("return", new BigNumber(borrowRatePerDay.plus(1)).pow(365).minus(1));
+              return _context7.abrupt("return", new BigNumber(borrowRatePerDay.plus(1)).pow(365).minus(1));
 
             case 5:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
         }
-      }, _callee5, this);
+      }, _callee7, this);
     }));
 
     function getBorrowAPY() {
@@ -3433,21 +3511,21 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getCollateralRatio = /*#__PURE__*/function () {
-    var _getCollateralRatio = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6() {
-      return runtime_1.wrap(function _callee6$(_context6) {
+    var _getCollateralRatio = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8() {
+      return runtime_1.wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
-              return _context6.abrupt("return", this.env.comptroller.markets(this.auToken.address).then(function (res) {
+              return _context8.abrupt("return", this.env.comptroller.markets(this.auToken.address).then(function (res) {
                 return new BigNumber(res.collateralFactorMantissa.toString()).div(decimalFactor(18));
               }));
 
             case 1:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
         }
-      }, _callee6, this);
+      }, _callee8, this);
     }));
 
     function getCollateralRatio() {
@@ -3458,37 +3536,30 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getBorrowPlyAPY = /*#__PURE__*/function () {
-    var _getBorrowPlyAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7() {
-      var promises, totalBorrowed, rewardSpeed, plyPrice, underlyingPrice;
-      return runtime_1.wrap(function _callee7$(_context7) {
+    var _getBorrowPlyAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee9() {
+      var _yield$Promise$all2, totalBorrowed, rewardSpeeds, plyPrice, underlyingPrice;
+
+      return runtime_1.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
-              promises = [];
-              promises.push(this.getTotalTokenBorrowed().then(function (res) {
-                totalBorrowed = res;
-              }));
-              promises.push(this.env.comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address, false).then(function (res) {
-                rewardSpeed = new TokenAmount(PLYToken, res.toString());
-              }));
-              promises.push(fetchPrice(networkAddresses.tokens.PLY, this._networkConnection.provider).then(function (res) {
-                plyPrice = res;
-              }));
-              promises.push(fetchPrice(this.underlying.address, this._networkConnection.provider).then(function (res) {
-                underlyingPrice = res;
-              }));
-              _context7.next = 7;
-              return Promise.all(promises);
+              _context9.next = 2;
+              return Promise.all([this.getTotalTokenBorrowed(), this.getRewardSpeeds(), this.getPlyPrice(), this.getUnderlyingPrice()]);
 
-            case 7:
-              return _context7.abrupt("return", calcLMRewardApr(plyPrice.multipliedBy(rewardSpeed.formattedAmount()), underlyingPrice.multipliedBy(totalBorrowed.formattedAmount()), ONE_YEAR));
+            case 2:
+              _yield$Promise$all2 = _context9.sent;
+              totalBorrowed = _yield$Promise$all2[0];
+              rewardSpeeds = _yield$Promise$all2[1];
+              plyPrice = _yield$Promise$all2[2];
+              underlyingPrice = _yield$Promise$all2[3];
+              return _context9.abrupt("return", calcLMRewardApr(calcValuation(new TokenAmount(PLYToken, rewardSpeeds.plyRewardBorrowSpeed.toString()), plyPrice), underlyingPrice.multipliedBy(totalBorrowed.formattedAmount()), ONE_YEAR));
 
             case 8:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
         }
-      }, _callee7, this);
+      }, _callee9, this);
     }));
 
     function getBorrowPlyAPY() {
@@ -3499,37 +3570,30 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getDepositPlyAPY = /*#__PURE__*/function () {
-    var _getDepositPlyAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8() {
-      var promises, totalDeposited, rewardSpeed, plyPrice, underlyingPrice;
-      return runtime_1.wrap(function _callee8$(_context8) {
+    var _getDepositPlyAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee10() {
+      var _yield$Promise$all3, totalDeposited, rewardSpeeds, plyPrice, underlyingPrice;
+
+      return runtime_1.wrap(function _callee10$(_context10) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context10.prev = _context10.next) {
             case 0:
-              promises = [];
-              promises.push(this.getTotalTokenDeposited().then(function (res) {
-                totalDeposited = res;
-              }));
-              promises.push(this.env.comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address, true).then(function (res) {
-                rewardSpeed = new TokenAmount(PLYToken, res.toString());
-              }));
-              promises.push(fetchPrice(networkAddresses.tokens.PLY, this._networkConnection.provider).then(function (res) {
-                plyPrice = res;
-              }));
-              promises.push(fetchPrice(this.underlying.address, this._networkConnection.provider).then(function (res) {
-                underlyingPrice = res;
-              }));
-              _context8.next = 7;
-              return Promise.all(promises);
+              _context10.next = 2;
+              return Promise.all([this.getTotalTokenDeposited(), this.getRewardSpeeds(), this.getPlyPrice(), this.getUnderlyingPrice()]);
 
-            case 7:
-              return _context8.abrupt("return", calcLMRewardApr(plyPrice.multipliedBy(rewardSpeed.formattedAmount()), underlyingPrice.multipliedBy(totalDeposited.formattedAmount()), ONE_YEAR));
+            case 2:
+              _yield$Promise$all3 = _context10.sent;
+              totalDeposited = _yield$Promise$all3[0];
+              rewardSpeeds = _yield$Promise$all3[1];
+              plyPrice = _yield$Promise$all3[2];
+              underlyingPrice = _yield$Promise$all3[3];
+              return _context10.abrupt("return", calcLMRewardApr(calcValuation(new TokenAmount(PLYToken, rewardSpeeds.plyRewardSupplySpeed.toString()), plyPrice), underlyingPrice.multipliedBy(totalDeposited.formattedAmount()), ONE_YEAR));
 
             case 8:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
         }
-      }, _callee8, this);
+      }, _callee10, this);
     }));
 
     function getDepositPlyAPY() {
@@ -3539,103 +3603,190 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     return getDepositPlyAPY;
   }();
 
-  _proto.getDetails = /*#__PURE__*/function () {
-    var _getDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee9() {
-      var promises, totalDeposited, totalBorrowed, depositAPY, borrowAPY, collateralRatio, plyPrice, underlyingPrice, rewardSpeeds, borrowPlyApy, depositPlyApy, depositNEARApy, borrowNEARApy, depositMETAApy;
-      return runtime_1.wrap(function _callee9$(_context9) {
+  _proto.getDepositNearAPY = /*#__PURE__*/function () {
+    var _getDepositNearAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee11() {
+      var _yield$Promise$all4, totalDeposited, underlyingPrice, depositNEARApy;
+
+      return runtime_1.wrap(function _callee11$(_context11) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context11.prev = _context11.next) {
             case 0:
-              promises = [];
-              promises.push(this.getTotalTokenDeposited().then(function (res) {
-                totalDeposited = res;
-              }));
-              promises.push(this.getTotalTokenBorrowed().then(function (res) {
-                totalBorrowed = res;
-              }));
-              promises.push(this.getDepositAPY().then(function (res) {
-                depositAPY = res.toNumber();
-              }));
-              promises.push(this.getBorrowAPY().then(function (res) {
-                borrowAPY = res.toNumber();
-              }));
-              promises.push(this.getCollateralRatio().then(function (res) {
-                collateralRatio = res.toNumber();
-              }));
-              promises.push(this.getRewardSpeeds().then(function (res) {
-                rewardSpeeds = res;
-              }));
-              promises.push(fetchPrice(networkAddresses.tokens.PLY, this._networkConnection.provider).then(function (res) {
-                plyPrice = res;
-              }));
-              promises.push(fetchPrice(this.underlying.address, this._networkConnection.provider).then(function (res) {
-                underlyingPrice = res;
-              }));
-              _context9.next = 11;
-              return Promise.all(promises);
+              _context11.next = 2;
+              return Promise.all([this.getTotalTokenDeposited(), this.getUnderlyingPrice()]);
 
-            case 11:
-              borrowPlyApy = calcLMRewardApr(calcValuation(new TokenAmount(PLYToken, rewardSpeeds.plyRewardBorrowSpeed.toString()), plyPrice), underlyingPrice.multipliedBy(totalBorrowed.formattedAmount()), ONE_YEAR);
-              depositPlyApy = calcLMRewardApr(calcValuation(new TokenAmount(PLYToken, rewardSpeeds.plyRewardSupplySpeed.toString()), plyPrice), underlyingPrice.multipliedBy(totalDeposited.formattedAmount()), ONE_YEAR);
-              _context9.t0 = helpers;
-              _context9.next = 16;
+            case 2:
+              _yield$Promise$all4 = _context11.sent;
+              totalDeposited = _yield$Promise$all4[0];
+              underlyingPrice = _yield$Promise$all4[1];
+              _context11.t0 = helpers;
+              _context11.next = 8;
               return fetchValuation(this.getDepositNEARRewardPerWeek(), this._networkConnection.provider);
 
-            case 16:
-              _context9.t1 = _context9.sent;
-              _context9.t2 = underlyingPrice.multipliedBy(totalDeposited.formattedAmount());
-              depositNEARApy = _context9.t0.calcLMRewardApr.call(_context9.t0, _context9.t1, _context9.t2, 52);
-              _context9.t3 = helpers;
-              _context9.next = 22;
+            case 8:
+              _context11.t1 = _context11.sent;
+              _context11.t2 = underlyingPrice.multipliedBy(totalDeposited.formattedAmount());
+              depositNEARApy = _context11.t0.calcLMRewardApr.call(_context11.t0, _context11.t1, _context11.t2, 52);
+              return _context11.abrupt("return", depositNEARApy);
+
+            case 12:
+            case "end":
+              return _context11.stop();
+          }
+        }
+      }, _callee11, this);
+    }));
+
+    function getDepositNearAPY() {
+      return _getDepositNearAPY.apply(this, arguments);
+    }
+
+    return getDepositNearAPY;
+  }();
+
+  _proto.getBorrowNearAPY = /*#__PURE__*/function () {
+    var _getBorrowNearAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee12() {
+      var _yield$Promise$all5, totalBorrowed, underlyingPrice, borrowNEARApy;
+
+      return runtime_1.wrap(function _callee12$(_context12) {
+        while (1) {
+          switch (_context12.prev = _context12.next) {
+            case 0:
+              _context12.next = 2;
+              return Promise.all([this.getTotalTokenBorrowed(), this.getUnderlyingPrice()]);
+
+            case 2:
+              _yield$Promise$all5 = _context12.sent;
+              totalBorrowed = _yield$Promise$all5[0];
+              underlyingPrice = _yield$Promise$all5[1];
+              _context12.t0 = helpers;
+              _context12.next = 8;
               return fetchValuation(this.getBorrowNEARRewardPerWeek(), this._networkConnection.provider);
 
-            case 22:
-              _context9.t4 = _context9.sent;
-              _context9.t5 = underlyingPrice.multipliedBy(totalBorrowed.formattedAmount());
-              borrowNEARApy = _context9.t3.calcLMRewardApr.call(_context9.t3, _context9.t4, _context9.t5, 52);
+            case 8:
+              _context12.t1 = _context12.sent;
+              _context12.t2 = underlyingPrice.multipliedBy(totalBorrowed.formattedAmount());
+              borrowNEARApy = _context12.t0.calcLMRewardApr.call(_context12.t0, _context12.t1, _context12.t2, 52);
+              return _context12.abrupt("return", borrowNEARApy);
+
+            case 12:
+            case "end":
+              return _context12.stop();
+          }
+        }
+      }, _callee12, this);
+    }));
+
+    function getBorrowNearAPY() {
+      return _getBorrowNearAPY.apply(this, arguments);
+    }
+
+    return getBorrowNearAPY;
+  }();
+
+  _proto.getDepositMetaAPY = /*#__PURE__*/function () {
+    var _getDepositMetaAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee13() {
+      var _yield$Promise$all6, totalDeposited, underlyingPrice, depositMETAApy;
+
+      return runtime_1.wrap(function _callee13$(_context13) {
+        while (1) {
+          switch (_context13.prev = _context13.next) {
+            case 0:
+              _context13.next = 2;
+              return Promise.all([this.getTotalTokenDeposited(), fetchPrice(this.underlying.address, this._networkConnection.provider)]);
+
+            case 2:
+              _yield$Promise$all6 = _context13.sent;
+              totalDeposited = _yield$Promise$all6[0];
+              underlyingPrice = _yield$Promise$all6[1];
 
               if (!isSameAddress(this.underlying.address, networkAddresses.tokens.stNEAR)) {
-                _context9.next = 34;
+                _context13.next = 14;
                 break;
               }
 
-              _context9.t6 = helpers;
-              _context9.next = 29;
+              _context13.t0 = helpers;
+              _context13.next = 9;
               return fetchValuation(TokenAmount.fromAddressAndAmount(networkAddresses.tokens.META, '1250000', false), this._networkConnection.provider);
 
-            case 29:
-              _context9.t7 = _context9.sent;
-              _context9.t8 = underlyingPrice.multipliedBy(totalDeposited.formattedAmount());
-              depositMETAApy = _context9.t6.calcLMRewardApr.call(_context9.t6, _context9.t7, _context9.t8, 12);
-              _context9.next = 35;
+            case 9:
+              _context13.t1 = _context13.sent;
+              _context13.t2 = underlyingPrice.multipliedBy(totalDeposited.formattedAmount());
+              depositMETAApy = _context13.t0.calcLMRewardApr.call(_context13.t0, _context13.t1, _context13.t2, 12);
+              _context13.next = 15;
               break;
 
-            case 34:
+            case 14:
               depositMETAApy = new BigNumber(0);
 
-            case 35:
-              return _context9.abrupt("return", {
+            case 15:
+              return _context13.abrupt("return", depositMETAApy);
+
+            case 16:
+            case "end":
+              return _context13.stop();
+          }
+        }
+      }, _callee13, this);
+    }));
+
+    function getDepositMetaAPY() {
+      return _getDepositMetaAPY.apply(this, arguments);
+    }
+
+    return getDepositMetaAPY;
+  }();
+
+  _proto.getDetails = /*#__PURE__*/function () {
+    var _getDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee14() {
+      var _yield$Promise$all7, totalDeposited, totalBorrowed, depositAPY, borrowAPY, collateralRatio, rewardSpeeds, _yield$Promise$all8, depositPlyAPY, borrowPlyAPY, depositNearAPY, borrowNearAPY, depositMetaAPY;
+
+      return runtime_1.wrap(function _callee14$(_context14) {
+        while (1) {
+          switch (_context14.prev = _context14.next) {
+            case 0:
+              _context14.next = 2;
+              return Promise.all([this.getTotalTokenDeposited(), this.getTotalTokenBorrowed(), this.getDepositAPY(), this.getBorrowAPY(), this.getCollateralRatio(), this.getRewardSpeeds()]);
+
+            case 2:
+              _yield$Promise$all7 = _context14.sent;
+              totalDeposited = _yield$Promise$all7[0];
+              totalBorrowed = _yield$Promise$all7[1];
+              depositAPY = _yield$Promise$all7[2];
+              borrowAPY = _yield$Promise$all7[3];
+              collateralRatio = _yield$Promise$all7[4];
+              rewardSpeeds = _yield$Promise$all7[5];
+              _context14.next = 11;
+              return Promise.all([this.getDepositPlyAPY(), this.getBorrowPlyAPY(), this.getDepositNearAPY(), this.getBorrowNearAPY(), this.getDepositMetaAPY()]);
+
+            case 11:
+              _yield$Promise$all8 = _context14.sent;
+              depositPlyAPY = _yield$Promise$all8[0];
+              borrowPlyAPY = _yield$Promise$all8[1];
+              depositNearAPY = _yield$Promise$all8[2];
+              borrowNearAPY = _yield$Promise$all8[3];
+              depositMetaAPY = _yield$Promise$all8[4];
+              return _context14.abrupt("return", {
                 auTokenAddress: this.auToken.address,
                 totalTokenDeposited: totalDeposited,
                 totalTokenBorrowed: totalBorrowed,
-                depositApy: depositAPY,
-                depositPlyApy: depositPlyApy.toNumber(),
-                borrowApy: borrowAPY,
-                borrowPlyApy: borrowPlyApy.toNumber() * -1,
-                collateralRatio: collateralRatio,
+                depositApy: depositAPY.toNumber(),
+                depositPlyApy: depositPlyAPY.toNumber(),
+                borrowApy: borrowAPY.toNumber(),
+                borrowPlyApy: borrowPlyAPY.toNumber() * -1,
+                collateralRatio: collateralRatio.toNumber(),
                 depositPlyPerWeek: new TokenAmount(PLYToken, rewardSpeeds.plyRewardSupplySpeed.mul(ONE_DAY).mul(7).toString()),
                 borrowPlyPerWeek: new TokenAmount(PLYToken, rewardSpeeds.plyRewardBorrowSpeed.mul(ONE_DAY).mul(7).toString()),
-                depositNEARApy: depositNEARApy.toNumber(),
-                borrowNEARApy: borrowNEARApy.toNumber() * -1,
-                depositMETAApy: depositMETAApy.toNumber()
+                depositNEARApy: depositNearAPY.toNumber(),
+                borrowNEARApy: borrowNearAPY.toNumber() * -1,
+                depositMETAApy: depositMetaAPY.toNumber()
               });
 
-            case 36:
+            case 18:
             case "end":
-              return _context9.stop();
+              return _context14.stop();
           }
         }
-      }, _callee9, this);
+      }, _callee14, this);
     }));
 
     function getDetails() {
@@ -3646,25 +3797,25 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getUserBorrowBalance = /*#__PURE__*/function () {
-    var _getUserBorrowBalance = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee10(userAddress) {
+    var _getUserBorrowBalance = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee15(userAddress) {
       var totalBorrow;
-      return runtime_1.wrap(function _callee10$(_context10) {
+      return runtime_1.wrap(function _callee15$(_context15) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context15.prev = _context15.next) {
             case 0:
-              _context10.next = 2;
+              _context15.next = 2;
               return this.auToken.callStatic.borrowBalanceCurrent(userAddress);
 
             case 2:
-              totalBorrow = _context10.sent;
-              return _context10.abrupt("return", new TokenAmount(this.underlying, totalBorrow.toString()));
+              totalBorrow = _context15.sent;
+              return _context15.abrupt("return", new TokenAmount(this.underlying, totalBorrow.toString()));
 
             case 4:
             case "end":
-              return _context10.stop();
+              return _context15.stop();
           }
         }
-      }, _callee10, this);
+      }, _callee15, this);
     }));
 
     function getUserBorrowBalance(_x) {
@@ -3675,25 +3826,25 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getUserDepositBalance = /*#__PURE__*/function () {
-    var _getUserDepositBalance = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee11(userAddress) {
+    var _getUserDepositBalance = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee16(userAddress) {
       var totalDeposit;
-      return runtime_1.wrap(function _callee11$(_context11) {
+      return runtime_1.wrap(function _callee16$(_context16) {
         while (1) {
-          switch (_context11.prev = _context11.next) {
+          switch (_context16.prev = _context16.next) {
             case 0:
-              _context11.next = 2;
+              _context16.next = 2;
               return this.auToken.callStatic.balanceOfUnderlying(userAddress);
 
             case 2:
-              totalDeposit = _context11.sent;
-              return _context11.abrupt("return", new TokenAmount(this.underlying, totalDeposit.toString()));
+              totalDeposit = _context16.sent;
+              return _context16.abrupt("return", new TokenAmount(this.underlying, totalDeposit.toString()));
 
             case 4:
             case "end":
-              return _context11.stop();
+              return _context16.stop();
           }
         }
-      }, _callee11, this);
+      }, _callee16, this);
     }));
 
     function getUserDepositBalance(_x2) {
@@ -3738,107 +3889,225 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   };
 
   _proto.mintCap = /*#__PURE__*/function () {
-    var _mintCap = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee12() {
-      return runtime_1.wrap(function _callee12$(_context12) {
+    var _mintCap = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee17() {
+      return runtime_1.wrap(function _callee17$(_context17) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context17.prev = _context17.next) {
+            case 0:
+              _context17.t0 = TokenAmount;
+              _context17.t1 = this.underlying;
+              _context17.next = 4;
+              return this.env.comptroller.mintCaps(this.auToken.address);
+
+            case 4:
+              _context17.t2 = _context17.sent.toString();
+              return _context17.abrupt("return", new _context17.t0(_context17.t1, _context17.t2));
+
+            case 6:
+            case "end":
+              return _context17.stop();
+          }
+        }
+      }, _callee17, this);
+    }));
+
+    function mintCap() {
+      return _mintCap.apply(this, arguments);
+    }
+
+    return mintCap;
+  }();
+
+  _proto.borrowCap = /*#__PURE__*/function () {
+    var _borrowCap = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee18() {
+      return runtime_1.wrap(function _callee18$(_context18) {
+        while (1) {
+          switch (_context18.prev = _context18.next) {
+            case 0:
+              _context18.t0 = TokenAmount;
+              _context18.t1 = this.underlying;
+              _context18.next = 4;
+              return this.env.comptroller.borrowCaps(this.auToken.address);
+
+            case 4:
+              _context18.t2 = _context18.sent.toString();
+              return _context18.abrupt("return", new _context18.t0(_context18.t1, _context18.t2));
+
+            case 6:
+            case "end":
+              return _context18.stop();
+          }
+        }
+      }, _callee18, this);
+    }));
+
+    function borrowCap() {
+      return _borrowCap.apply(this, arguments);
+    }
+
+    return borrowCap;
+  }();
+
+  _proto.getApyWithoutIncentive = /*#__PURE__*/function () {
+    var _getApyWithoutIncentive = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee19(userAddress) {
+      var _yield$Promise$all9, price, depositApy, borrowApy, depositBalance, borrowBalance, suppliedValue, borrowedValue, sum;
+
+      return runtime_1.wrap(function _callee19$(_context19) {
+        while (1) {
+          switch (_context19.prev = _context19.next) {
             case 0:
-              _context12.t0 = TokenAmount;
-              _context12.t1 = this.underlying;
-              _context12.next = 4;
-              return this.env.comptroller.mintCaps(this.auToken.address);
+              _context19.next = 2;
+              return Promise.all([this.getUnderlyingPrice(), this.getDepositAPY(), this.getBorrowAPY(), this.getUserDepositBalance(userAddress), this.getUserBorrowBalance(userAddress)]);
 
-            case 4:
-              _context12.t2 = _context12.sent.toString();
-              return _context12.abrupt("return", new _context12.t0(_context12.t1, _context12.t2));
+            case 2:
+              _yield$Promise$all9 = _context19.sent;
+              price = _yield$Promise$all9[0];
+              depositApy = _yield$Promise$all9[1];
+              borrowApy = _yield$Promise$all9[2];
+              depositBalance = _yield$Promise$all9[3];
+              borrowBalance = _yield$Promise$all9[4];
+              suppliedValue = price.multipliedBy(depositBalance.formattedAmount());
+              borrowedValue = price.multipliedBy(borrowBalance.formattedAmount());
+              sum = calcNetApy(suppliedValue, depositApy, borrowedValue, borrowApy);
+              return _context19.abrupt("return", {
+                sum: sum,
+                suppliedValue: suppliedValue,
+                borrowedValue: borrowedValue
+              });
 
-            case 6:
+            case 12:
             case "end":
-              return _context12.stop();
+              return _context19.stop();
           }
         }
-      }, _callee12, this);
+      }, _callee19, this);
     }));
 
-    function mintCap() {
-      return _mintCap.apply(this, arguments);
+    function getApyWithoutIncentive(_x3) {
+      return _getApyWithoutIncentive.apply(this, arguments);
     }
 
-    return mintCap;
+    return getApyWithoutIncentive;
   }();
 
-  _proto.borrowCap = /*#__PURE__*/function () {
-    var _borrowCap = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee13() {
-      return runtime_1.wrap(function _callee13$(_context13) {
+  _proto.getApyWithIncentive = /*#__PURE__*/function () {
+    var _getApyWithIncentive = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee20(userAddress) {
+      var _yield$Promise$all10, price, depositApy, borrowApy, depositBalance, borrowBalance, nearDepositApy, plyDepositApy, metaDepositApy, nearBorrowApy, plyBorrowApy, suppliedValue, borrowedValue, totalDepositApy, totalBorrowApy, sum;
+
+      return runtime_1.wrap(function _callee20$(_context20) {
         while (1) {
-          switch (_context13.prev = _context13.next) {
+          switch (_context20.prev = _context20.next) {
             case 0:
-              _context13.t0 = TokenAmount;
-              _context13.t1 = this.underlying;
-              _context13.next = 4;
-              return this.env.comptroller.borrowCaps(this.auToken.address);
+              _context20.next = 2;
+              return Promise.all([this.getUnderlyingPrice(), this.getDepositAPY(), this.getBorrowAPY(), this.getUserDepositBalance(userAddress), this.getUserBorrowBalance(userAddress), this.getDepositNearAPY(), this.getDepositPlyAPY(), this.getDepositMetaAPY(), this.getBorrowNearAPY(), this.getBorrowPlyAPY()]);
 
-            case 4:
-              _context13.t2 = _context13.sent.toString();
-              return _context13.abrupt("return", new _context13.t0(_context13.t1, _context13.t2));
+            case 2:
+              _yield$Promise$all10 = _context20.sent;
+              price = _yield$Promise$all10[0];
+              depositApy = _yield$Promise$all10[1];
+              borrowApy = _yield$Promise$all10[2];
+              depositBalance = _yield$Promise$all10[3];
+              borrowBalance = _yield$Promise$all10[4];
+              nearDepositApy = _yield$Promise$all10[5];
+              plyDepositApy = _yield$Promise$all10[6];
+              metaDepositApy = _yield$Promise$all10[7];
+              nearBorrowApy = _yield$Promise$all10[8];
+              plyBorrowApy = _yield$Promise$all10[9];
+              suppliedValue = price.multipliedBy(depositBalance.formattedAmount());
+              borrowedValue = price.multipliedBy(borrowBalance.formattedAmount());
+              totalDepositApy = depositApy.plus(nearDepositApy).plus(plyDepositApy).plus(metaDepositApy);
+              totalBorrowApy = borrowApy.plus(nearBorrowApy).plus(plyBorrowApy);
+              sum = calcNetApy(suppliedValue, totalDepositApy, borrowedValue, totalBorrowApy);
+              return _context20.abrupt("return", {
+                sum: sum,
+                suppliedValue: suppliedValue,
+                borrowedValue: borrowedValue
+              });
 
-            case 6:
+            case 19:
             case "end":
-              return _context13.stop();
+              return _context20.stop();
           }
         }
-      }, _callee13, this);
+      }, _callee20, this);
     }));
 
-    function borrowCap() {
-      return _borrowCap.apply(this, arguments);
+    function getApyWithIncentive(_x4) {
+      return _getApyWithIncentive.apply(this, arguments);
     }
 
-    return borrowCap;
+    return getApyWithIncentive;
   }();
 
   return MoneyMarketRead;
 }(BlockchainEntityRead);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getUnderlyingPrice", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getPlyPrice", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getRewardSpeeds", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getTotalTokenBorrowed", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getTotalTokenDeposited", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getDepositAPY", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getBorrowAPY", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getCollateralRatio", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getBorrowPlyAPY", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getDepositPlyAPY", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getDepositNearAPY", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getBorrowNearAPY", null);
+
+__decorate([Cache(CACHE_TIMEOUT), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getDepositMetaAPY", null);
+
 var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   _inheritsLoose(MoneyMarketReadWrite, _MoneyMarketRead);
 
   function MoneyMarketReadWrite(networkConnection, auToken, underlyingAsset) {
-    var _this3;
+    var _this2;
 
-    _this3 = _MoneyMarketRead.call(this, networkConnection, auToken, underlyingAsset) || this;
-    _this3._EthRepayHelper = new Contract(networkAddresses.misc.ETHREPAYHELPER, abis$9.abi, networkConnection.provider);
-    return _this3;
+    _this2 = _MoneyMarketRead.call(this, networkConnection, auToken, underlyingAsset) || this;
+    _this2._EthRepayHelper = new Contract(networkAddresses.misc.ETHREPAYHELPER, abis$9.abi, networkConnection.provider);
+    return _this2;
   }
 
   var _proto2 = MoneyMarketReadWrite.prototype;
 
   _proto2.deposit = /*#__PURE__*/function () {
-    var _deposit = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee14(amount) {
-      return runtime_1.wrap(function _callee14$(_context14) {
+    var _deposit = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee21(amount) {
+      return runtime_1.wrap(function _callee21$(_context21) {
         while (1) {
-          switch (_context14.prev = _context14.next) {
+          switch (_context21.prev = _context21.next) {
             case 0:
               if (!isSameAddress(amount.token.address, ETHAddress)) {
-                _context14.next = 4;
+                _context21.next = 4;
                 break;
               }
 
-              return _context14.abrupt("return", this.auToken.connect(this._networkConnection.signer).mint({
+              return _context21.abrupt("return", this.auToken.connect(this._networkConnection.signer).mint({
                 value: amount.rawAmount()
               }));
 
             case 4:
-              return _context14.abrupt("return", this.auToken.connect(this._networkConnection.signer).mint(amount.rawAmount()));
+              return _context21.abrupt("return", this.auToken.connect(this._networkConnection.signer).mint(amount.rawAmount()));
 
             case 5:
             case "end":
-              return _context14.stop();
+              return _context21.stop();
           }
         }
-      }, _callee14, this);
+      }, _callee21, this);
     }));
 
-    function deposit(_x3) {
+    function deposit(_x5) {
       return _deposit.apply(this, arguments);
     }
 
@@ -3846,22 +4115,22 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.borrow = /*#__PURE__*/function () {
-    var _borrow = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee15(amount) {
-      return runtime_1.wrap(function _callee15$(_context15) {
+    var _borrow = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee22(amount) {
+      return runtime_1.wrap(function _callee22$(_context22) {
         while (1) {
-          switch (_context15.prev = _context15.next) {
+          switch (_context22.prev = _context22.next) {
             case 0:
-              return _context15.abrupt("return", this.auToken.connect(this._networkConnection.signer).borrow(amount.rawAmount()));
+              return _context22.abrupt("return", this.auToken.connect(this._networkConnection.signer).borrow(amount.rawAmount()));
 
             case 1:
             case "end":
-              return _context15.stop();
+              return _context22.stop();
           }
         }
-      }, _callee15, this);
+      }, _callee22, this);
     }));
 
-    function borrow(_x4) {
+    function borrow(_x6) {
       return _borrow.apply(this, arguments);
     }
 
@@ -3869,30 +4138,30 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.withdraw = /*#__PURE__*/function () {
-    var _withdraw = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee16(amount) {
-      return runtime_1.wrap(function _callee16$(_context16) {
+    var _withdraw = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee23(amount) {
+      return runtime_1.wrap(function _callee23$(_context23) {
         while (1) {
-          switch (_context16.prev = _context16.next) {
+          switch (_context23.prev = _context23.next) {
             case 0:
               if (!new BigNumber(amount.rawAmount()).lt(0)) {
-                _context16.next = 2;
+                _context23.next = 2;
                 break;
               }
 
-              return _context16.abrupt("return", this.auToken.connect(this._networkConnection.signer).redeemUnderlying(INF));
+              return _context23.abrupt("return", this.auToken.connect(this._networkConnection.signer).redeemUnderlying(INF));
 
             case 2:
-              return _context16.abrupt("return", this.auToken.connect(this._networkConnection.signer).redeemUnderlying(amount.rawAmount()));
+              return _context23.abrupt("return", this.auToken.connect(this._networkConnection.signer).redeemUnderlying(amount.rawAmount()));
 
             case 3:
             case "end":
-              return _context16.stop();
+              return _context23.stop();
           }
         }
-      }, _callee16, this);
+      }, _callee23, this);
     }));
 
-    function withdraw(_x5) {
+    function withdraw(_x7) {
       return _withdraw.apply(this, arguments);
     }
 
@@ -3900,40 +4169,40 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.repay = /*#__PURE__*/function () {
-    var _repay = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee17(amount) {
-      return runtime_1.wrap(function _callee17$(_context17) {
+    var _repay = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee24(amount) {
+      return runtime_1.wrap(function _callee24$(_context24) {
         while (1) {
-          switch (_context17.prev = _context17.next) {
+          switch (_context24.prev = _context24.next) {
             case 0:
               if (!isSameAddress(amount.token.address, ETHAddress)) {
-                _context17.next = 4;
+                _context24.next = 4;
                 break;
               }
 
-              return _context17.abrupt("return", this._EthRepayHelper.connect(this._networkConnection.signer).repayBorrow({
+              return _context24.abrupt("return", this._EthRepayHelper.connect(this._networkConnection.signer).repayBorrow({
                 value: amount.rawAmount()
               }));
 
             case 4:
               if (!new BigNumber(amount.rawAmount()).lt(0)) {
-                _context17.next = 8;
+                _context24.next = 8;
                 break;
               }
 
-              return _context17.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(INF));
+              return _context24.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(INF));
 
             case 8:
-              return _context17.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(amount.rawAmount()));
+              return _context24.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(amount.rawAmount()));
 
             case 9:
             case "end":
-              return _context17.stop();
+              return _context24.stop();
           }
         }
-      }, _callee17, this);
+      }, _callee24, this);
     }));
 
-    function repay(_x6) {
+    function repay(_x8) {
       return _repay.apply(this, arguments);
     }
 
@@ -3941,19 +4210,19 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.enableCollateral = /*#__PURE__*/function () {
-    var _enableCollateral = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee18() {
-      return runtime_1.wrap(function _callee18$(_context18) {
+    var _enableCollateral = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee25() {
+      return runtime_1.wrap(function _callee25$(_context25) {
         while (1) {
-          switch (_context18.prev = _context18.next) {
+          switch (_context25.prev = _context25.next) {
             case 0:
-              return _context18.abrupt("return", this.env.comptroller.connect(this._networkConnection.signer).enterMarkets([this.auToken.address]));
+              return _context25.abrupt("return", this.env.comptroller.connect(this._networkConnection.signer).enterMarkets([this.auToken.address]));
 
             case 1:
             case "end":
-              return _context18.stop();
+              return _context25.stop();
           }
         }
-      }, _callee18, this);
+      }, _callee25, this);
     }));
 
     function enableCollateral() {
@@ -3964,19 +4233,19 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.disableCollateral = /*#__PURE__*/function () {
-    var _disableCollateral = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee19() {
-      return runtime_1.wrap(function _callee19$(_context19) {
+    var _disableCollateral = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee26() {
+      return runtime_1.wrap(function _callee26$(_context26) {
         while (1) {
-          switch (_context19.prev = _context19.next) {
+          switch (_context26.prev = _context26.next) {
             case 0:
-              return _context19.abrupt("return", this.env.comptroller.connect(this._networkConnection.signer).exitMarket(this.auToken.address));
+              return _context26.abrupt("return", this.env.comptroller.connect(this._networkConnection.signer).exitMarket(this.auToken.address));
 
             case 1:
             case "end":
-              return _context19.stop();
+              return _context26.stop();
           }
         }
-      }, _callee19, this);
+      }, _callee26, this);
     }));
 
     function disableCollateral() {
@@ -3992,12 +4261,12 @@ var MoneyMarket = /*#__PURE__*/function (_BlockchainEntity) {
   _inheritsLoose(MoneyMarket, _BlockchainEntity);
 
   function MoneyMarket(address, underlying) {
-    var _this4;
+    var _this3;
 
-    _this4 = _BlockchainEntity.call(this) || this;
-    _this4.address = validateAndParseAddress(address);
-    _this4.underlying = validateAndParseAddress(underlying);
-    return _this4;
+    _this3 = _BlockchainEntity.call(this) || this;
+    _this3.address = validateAndParseAddress(address);
+    _this3.underlying = validateAndParseAddress(underlying);
+    return _this3;
   }
 
   var _proto3 = MoneyMarket.prototype;
@@ -4224,29 +4493,25 @@ var PapermillRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   /*#__PURE__*/
   function () {
     var _getLockingDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee4(userAddress) {
-      var currentWeek, promises, values, percentLockCurrentWeek, percentLockNextWeek, totalRewards, _yield$this$env$pulp$, pulpAmountCurrentWeek, plyAmountCurrentWeek, plyAmountNextWeek, pulpAmountNextWeek, currentUnlockPortion, nextUnlockPortion;
+      var currentWeek, values, percentLockCurrentWeek, percentLockNextWeek, totalRewards, _yield$this$env$pulp$, pulpAmountCurrentWeek, plyAmountCurrentWeek, plyAmountNextWeek, pulpAmountNextWeek, currentUnlockPortion, nextUnlockPortion;
 
       return runtime_1.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               currentWeek = this.getWeek(getCurrentTimestamp());
-              promises = [];
-              promises.push(this.env.auriLens.getPercentLock(this.env.pulp.address, userAddress, currentWeek));
-              promises.push(this.env.auriLens.getPercentLock(this.env.pulp.address, userAddress, currentWeek + 1));
-              promises.push(this.getUnclaimedPlyReward(userAddress));
-              _context4.next = 7;
-              return Promise.all(promises);
+              _context4.next = 3;
+              return Promise.all([this.env.auriLens.getPercentLock(this.env.pulp.address, userAddress, currentWeek), this.env.auriLens.getPercentLock(this.env.pulp.address, userAddress, currentWeek + 1), this.getUnclaimedPlyReward(userAddress)]);
 
-            case 7:
+            case 3:
               values = _context4.sent;
               percentLockCurrentWeek = BigNumber$1.from(values[0]);
               percentLockNextWeek = BigNumber$1.from(values[1]);
               totalRewards = values[2];
-              _context4.next = 13;
+              _context4.next = 9;
               return this.env.pulp.calcLockAmount(userAddress, totalRewards.rawAmount());
 
-            case 13:
+            case 9:
               _yield$this$env$pulp$ = _context4.sent;
               pulpAmountCurrentWeek = _yield$this$env$pulp$[0];
               plyAmountCurrentWeek = _yield$this$env$pulp$[1];
@@ -4270,7 +4535,7 @@ var PapermillRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 nextPulp: new TokenAmount(this.pulpToken, pulpAmountNextWeek.toString())
               });
 
-            case 21:
+            case 17:
             case "end":
               return _context4.stop();
           }
@@ -4760,9 +5025,7 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
 
   _proto.getUserDetails = /*#__PURE__*/function () {
     var _getUserDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(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, totalBorrowLimit, _iterator, _step, _auToken, userMarketDetail, _moneyMarket, _yield$Promise$all, depositBalance, borrowBalance, collateralRatio, underlyingPrice, depositValues, _loop, i, accountLiquidity, borrowedvaluation, bufferedBorrowLimit, minimumBorrowLimitAllowed, borrowableAmount, auToken, moneyMarket, borrowLimitMargin, maxWithdrawCap;
 
       return runtime_1.wrap(function _callee$(_context) {
         while (1) {
@@ -4770,47 +5033,44 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
             case 0:
               marketCount = networkAddresses.auTokens.length;
               userMarketDetails = [];
-              promises = [];
               totalBorrowLimit = new BigNumber(0);
-              pricePromises = [];
-
-              _loop2 = function _loop2() {
-                var auToken = _step.value;
-                var userMarketDetail = {};
-                userMarketDetails.push(userMarketDetail);
-                userMarketDetail.market = auToken.underlying;
-                var moneyMarket = new MoneyMarketRead(_this2._networkConnection, auToken.address, auToken.underlying);
-                promises.push(moneyMarket.getUserDepositBalance(userAddress).then(function (res) {
-                  userMarketDetail.depositBalance = res;
-                }));
-                promises.push(moneyMarket.getUserBorrowBalance(userAddress).then(function (res) {
-                  userMarketDetail.borrowBalance = res;
-                }));
-                promises.push(moneyMarket.getCollateralRatio().then(function (res) {
-                  userMarketDetail.collateralRatio = res.toNumber();
-                }));
-                pricePromises.push(fetchPrice(moneyMarket.underlying.address, _this2._networkConnection.provider).then(function (res) {
-                  userMarketDetail.underlyingPrice = res.toString();
-                  return res;
-                }));
-              };
+              _iterator = _createForOfIteratorHelperLoose(networkAddresses.auTokens);
 
-              for (_iterator = _createForOfIteratorHelperLoose(networkAddresses.auTokens); !(_step = _iterator()).done;) {
-                _loop2();
+            case 4:
+              if ((_step = _iterator()).done) {
+                _context.next = 23;
+                break;
               }
 
-              promises.push(this.env.comptroller.getAssetsIn(userAddress).then(function (res) {
-                assetsIn = res;
-              }));
-              _context.next = 10;
-              return Promise.all(promises);
-
-            case 10:
+              _auToken = _step.value;
+              userMarketDetail = {};
+              userMarketDetails.push(userMarketDetail);
+              userMarketDetail.market = _auToken.underlying;
+              _moneyMarket = new MoneyMarketRead(this._networkConnection, _auToken.address, _auToken.underlying);
               _context.next = 12;
-              return Promise.all(pricePromises);
+              return Promise.all([_moneyMarket.getUserDepositBalance(userAddress), _moneyMarket.getUserBorrowBalance(userAddress), _moneyMarket.getCollateralRatio(), fetchPrice(_moneyMarket.underlying.address, this._networkConnection.provider)]);
 
             case 12:
-              underlyingPrices = _context.sent;
+              _yield$Promise$all = _context.sent;
+              depositBalance = _yield$Promise$all[0];
+              borrowBalance = _yield$Promise$all[1];
+              collateralRatio = _yield$Promise$all[2];
+              underlyingPrice = _yield$Promise$all[3];
+              userMarketDetail.depositBalance = depositBalance;
+              userMarketDetail.borrowBalance = borrowBalance;
+              userMarketDetail.collateralRatio = collateralRatio.toNumber();
+              userMarketDetail.underlyingPrice = underlyingPrice.toString();
+
+            case 21:
+              _context.next = 4;
+              break;
+
+            case 23:
+              _context.next = 25;
+              return this.env.comptroller.getAssetsIn(userAddress);
+
+            case 25:
+              assetsIn = _context.sent;
               depositValues = [];
 
               _loop = function _loop() {
@@ -4824,7 +5084,7 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                   userMarketDetails[i].isCollateral = false;
                 }
 
-                depositValues.push(calcValuation(userMarketDetails[i].depositBalance, underlyingPrices[i]));
+                depositValues.push(calcValuation(userMarketDetails[i].depositBalance, new BigNumber(userMarketDetails[i].underlyingPrice)));
               };
 
               for (i = 0; i < marketCount; i++) {
@@ -4835,13 +5095,10 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 if (userMarketDetails[index].isCollateral) return p.plus(v.multipliedBy(userMarketDetails[index].collateralRatio));
                 return p;
               }, new BigNumber(0));
-              _context.next = 19;
-              return this.env.comptroller.getAccountLiquidity(userAddress)["catch"](function (e) {
-                console.log(e);
-                return [BigNumber$1.from(0), BigNumber$1.from(0)];
-              });
+              _context.next = 32;
+              return this.env.comptroller.getAccountLiquidity(userAddress);
 
-            case 19:
+            case 32:
               accountLiquidity = _context.sent;
               borrowedvaluation = totalBorrowLimit.minus(new BigNumber(accountLiquidity[0].toString()).div(decimalFactor(18)));
 
@@ -4863,7 +5120,7 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 auToken = networkAddresses.auTokens[i];
                 moneyMarket = new MoneyMarketRead(this._networkConnection, auToken.address, auToken.underlying);
                 borrowLimitMargin = totalBorrowLimit.minus(minimumBorrowLimitAllowed).gt(0) ? totalBorrowLimit.minus(minimumBorrowLimitAllowed) : new BigNumber(0);
-                maxWithdrawCap = borrowLimitMargin.div(userMarketDetails[i].collateralRatio).div(underlyingPrices[i]);
+                maxWithdrawCap = borrowLimitMargin.div(userMarketDetails[i].collateralRatio).div(userMarketDetails[i].underlyingPrice);
                 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());
               }
 
@@ -4872,10 +5129,10 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 currency: 'USD',
                 amount: bufferedBorrowLimit.toFixed(DECIMAL_PRECISION)
               };
-              _context.next = 30;
+              _context.next = 43;
               return new PapermillRead(this._networkConnection).getLockingDetails(userAddress);
 
-            case 30:
+            case 43:
               _context.t2 = _context.sent;
               _context.t3 = {
                 currency: 'USD',
@@ -4888,7 +5145,7 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 borrowableAmount: _context.t3
               });
 
-            case 33:
+            case 46:
             case "end":
               return _context.stop();
           }
@@ -5062,7 +5319,7 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
 
   _proto.sneakAccounts = /*#__PURE__*/function () {
     var _sneakAccounts = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5(accounts, tokenAddresses, dust) {
-      var _this3 = this;
+      var _this2 = this;
 
       var _1E18, oracle, tokens, prices, exrate, res, _iterator2, _step2, addr, infos, _i, snapshot, bal, bor, balR, borR;
 
@@ -5077,7 +5334,7 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
               _1E18 = BigNumber$1.from(10).pow(18);
               oracle = this.env.getContract(networkAddresses.misc.oracle, AuriOracleABI.abi);
               tokens = tokenAddresses.map(function (addr) {
-                return _this3.env.getContract(addr, abis.abi);
+                return _this2.env.getContract(addr, abis.abi);
               });
               _context5.next = 6;
               return oracle.getUnderlyingPrices(tokenAddresses);
@@ -5165,6 +5422,114 @@ var MiscRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     return sneakAccounts;
   }();
 
+  _proto.getNetApyWithoutIncentive = /*#__PURE__*/function () {
+    var _getNetApyWithoutIncentive = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6(userAddress) {
+      var _this3 = this;
+
+      var sum, totalSuppliedValue, totalBorrowedValue, netApy, apys, _iterator3, _step3, apy;
+
+      return runtime_1.wrap(function _callee6$(_context6) {
+        while (1) {
+          switch (_context6.prev = _context6.next) {
+            case 0:
+              sum = new BigNumber(0);
+              totalSuppliedValue = new BigNumber(0);
+              totalBorrowedValue = new BigNumber(0);
+              netApy = new BigNumber(0);
+              _context6.next = 6;
+              return Promise.all(networkAddresses.auTokens.map(function (auToken) {
+                var moneyMarket = new MoneyMarketRead(_this3._networkConnection, auToken.address, auToken.underlying);
+                var apyWithoutIncentive = moneyMarket.getApyWithoutIncentive(userAddress);
+                return apyWithoutIncentive;
+              }));
+
+            case 6:
+              apys = _context6.sent;
+
+              for (_iterator3 = _createForOfIteratorHelperLoose(apys); !(_step3 = _iterator3()).done;) {
+                apy = _step3.value;
+                sum = sum.plus(apy.sum);
+                totalSuppliedValue = totalSuppliedValue.plus(apy.suppliedValue);
+                totalBorrowedValue = totalBorrowedValue.plus(apy.borrowedValue);
+              }
+
+              if (sum.gt(0)) {
+                netApy = sum.div(totalSuppliedValue);
+              } else if (sum.lt(0)) {
+                netApy = sum.div(totalBorrowedValue);
+              }
+
+              return _context6.abrupt("return", netApy);
+
+            case 10:
+            case "end":
+              return _context6.stop();
+          }
+        }
+      }, _callee6);
+    }));
+
+    function getNetApyWithoutIncentive(_x7) {
+      return _getNetApyWithoutIncentive.apply(this, arguments);
+    }
+
+    return getNetApyWithoutIncentive;
+  }();
+
+  _proto.getNetApyWithIncentive = /*#__PURE__*/function () {
+    var _getNetApyWithIncentive = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7(userAddress) {
+      var _this4 = this;
+
+      var sum, totalSuppliedValue, totalBorrowedValue, netApy, apys, _iterator4, _step4, apy;
+
+      return runtime_1.wrap(function _callee7$(_context7) {
+        while (1) {
+          switch (_context7.prev = _context7.next) {
+            case 0:
+              sum = new BigNumber(0);
+              totalSuppliedValue = new BigNumber(0);
+              totalBorrowedValue = new BigNumber(0);
+              netApy = new BigNumber(0);
+              _context7.next = 6;
+              return Promise.all(networkAddresses.auTokens.map(function (auToken) {
+                var moneyMarket = new MoneyMarketRead(_this4._networkConnection, auToken.address, auToken.underlying);
+                var apyWithIncentive = moneyMarket.getApyWithIncentive(userAddress);
+                return apyWithIncentive;
+              }));
+
+            case 6:
+              apys = _context7.sent;
+
+              for (_iterator4 = _createForOfIteratorHelperLoose(apys); !(_step4 = _iterator4()).done;) {
+                apy = _step4.value;
+                sum = sum.plus(apy.sum);
+                totalSuppliedValue = totalSuppliedValue.plus(apy.suppliedValue);
+                totalBorrowedValue = totalBorrowedValue.plus(apy.borrowedValue);
+              }
+
+              if (sum.gt(0)) {
+                netApy = sum.div(totalSuppliedValue);
+              } else if (sum.lt(0)) {
+                netApy = sum.div(totalBorrowedValue);
+              }
+
+              return _context7.abrupt("return", netApy);
+
+            case 10:
+            case "end":
+              return _context7.stop();
+          }
+        }
+      }, _callee7);
+    }));
+
+    function getNetApyWithIncentive(_x8) {
+      return _getNetApyWithIncentive.apply(this, arguments);
+    }
+
+    return getNetApyWithIncentive;
+  }();
+
   return MiscRead;
 }(BlockchainEntityRead);
 
@@ -5515,43 +5880,6 @@ var PlyGameRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     return getLastJackpotResult;
   }();
 
-  _proto.overallLeaderboard = /*#__PURE__*/function () {
-    var _overallLeaderboard = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8() {
-      var _this5 = this;
-
-      var result;
-      return runtime_1.wrap(function _callee8$(_context8) {
-        while (1) {
-          switch (_context8.prev = _context8.next) {
-            case 0:
-              _context8.next = 2;
-              return getPaginatedApi('/plygame/overallLeaderboard');
-
-            case 2:
-              result = _context8.sent;
-              return _context8.abrupt("return", result.items.map(function (item) {
-                return {
-                  player: item.user,
-                  unlockedPulpAmount: new TokenAmount(_this5.pulpToken, item.unlockedAmount),
-                  gamesPlayed: item.count
-                };
-              }));
-
-            case 4:
-            case "end":
-              return _context8.stop();
-          }
-        }
-      }, _callee8);
-    }));
-
-    function overallLeaderboard() {
-      return _overallLeaderboard.apply(this, arguments);
-    }
-
-    return overallLeaderboard;
-  }();
-
   return PlyGameRead;
 }(BlockchainEntityRead);
 var PlyGameReadWrite = /*#__PURE__*/function (_PlyGameRead) {
@@ -5569,19 +5897,19 @@ var PlyGameReadWrite = /*#__PURE__*/function (_PlyGameRead) {
   _proto2.makeBetOnce =
   /*#__PURE__*/
   function () {
-    var _makeBetOnce = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee9(amount) {
-      return runtime_1.wrap(function _callee9$(_context9) {
+    var _makeBetOnce = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8(amount) {
+      return runtime_1.wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
-              return _context9.abrupt("return", this.env.plygame.connect(this._networkConnection.signer).makeBetOnce(amount.rawAmount()));
+              return _context8.abrupt("return", this.env.plygame.connect(this._networkConnection.signer).makeBetOnce(amount.rawAmount()));
 
             case 1:
             case "end":
-              return _context9.stop();
+              return _context8.stop();
           }
         }
-      }, _callee9, this);
+      }, _callee8, this);
     }));
 
     function makeBetOnce(_x5) {
@@ -5592,19 +5920,19 @@ var PlyGameReadWrite = /*#__PURE__*/function (_PlyGameRead) {
   }();
 
   _proto2.approve = /*#__PURE__*/function () {
-    var _approve = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee10(amount) {
-      return runtime_1.wrap(function _callee10$(_context10) {
+    var _approve = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee9(amount) {
+      return runtime_1.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
-              return _context10.abrupt("return", this.env.ply.connect(this._networkConnection.signer).approve(this.env.plygame.address, amount.rawAmount()));
+              return _context9.abrupt("return", this.env.ply.connect(this._networkConnection.signer).approve(this.env.plygame.address, amount.rawAmount()));
 
             case 1:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
         }
-      }, _callee10, this);
+      }, _callee9, this);
     }));
 
     function approve(_x6) {
@@ -6576,6 +6904,56 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     return sneakAccounts;
   }();
 
+  _proto.getNetApyWithoutIncentive = /*#__PURE__*/function () {
+    var _getNetApyWithoutIncentive = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee10(userAddress) {
+      var miscRead;
+      return runtime_1.wrap(function _callee10$(_context10) {
+        while (1) {
+          switch (_context10.prev = _context10.next) {
+            case 0:
+              miscRead = new MiscRead(this._networkConnection);
+              return _context10.abrupt("return", miscRead.getNetApyWithoutIncentive(userAddress));
+
+            case 2:
+            case "end":
+              return _context10.stop();
+          }
+        }
+      }, _callee10, this);
+    }));
+
+    function getNetApyWithoutIncentive(_x10) {
+      return _getNetApyWithoutIncentive.apply(this, arguments);
+    }
+
+    return getNetApyWithoutIncentive;
+  }();
+
+  _proto.getNetApyWithIncentive = /*#__PURE__*/function () {
+    var _getNetApyWithIncentive = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee11(userAddress) {
+      var miscRead;
+      return runtime_1.wrap(function _callee11$(_context11) {
+        while (1) {
+          switch (_context11.prev = _context11.next) {
+            case 0:
+              miscRead = new MiscRead(this._networkConnection);
+              return _context11.abrupt("return", miscRead.getNetApyWithIncentive(userAddress));
+
+            case 2:
+            case "end":
+              return _context11.stop();
+          }
+        }
+      }, _callee11, this);
+    }));
+
+    function getNetApyWithIncentive(_x11) {
+      return _getNetApyWithIncentive.apply(this, arguments);
+    }
+
+    return getNetApyWithIncentive;
+  }();
+
   return SdkRead;
 }(BlockchainEntityRead);
 var SdkReadWrite = /*#__PURE__*/function (_SdkRead) {
@@ -6593,19 +6971,19 @@ var SdkReadWrite = /*#__PURE__*/function (_SdkRead) {
   _proto2.claim =
   /*#__PURE__*/
   function () {
-    var _claim = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee10() {
-      return runtime_1.wrap(function _callee10$(_context10) {
+    var _claim = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee12() {
+      return runtime_1.wrap(function _callee12$(_context12) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context12.prev = _context12.next) {
             case 0:
-              return _context10.abrupt("return", this.env.auriLens.connect(this._networkConnection.signer).claimRewards(this.env.comptroller.address, this.env.auriFairLaunch.address, ALL_STAKING_POOLS));
+              return _context12.abrupt("return", this.env.auriLens.connect(this._networkConnection.signer).claimRewards(this.env.comptroller.address, this.env.auriFairLaunch.address, ALL_STAKING_POOLS));
 
             case 1:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
         }
-      }, _callee10, this);
+      }, _callee12, this);
     }));
 
     function claim() {
@@ -6616,22 +6994,22 @@ var SdkReadWrite = /*#__PURE__*/function (_SdkRead) {
   }();
 
   _proto2.stake = /*#__PURE__*/function () {
-    var _stake = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee11(amount) {
-      return runtime_1.wrap(function _callee11$(_context11) {
+    var _stake = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee13(amount) {
+      return runtime_1.wrap(function _callee13$(_context13) {
         while (1) {
-          switch (_context11.prev = _context11.next) {
+          switch (_context13.prev = _context13.next) {
             case 0:
-              return _context11.abrupt("return", new StakingReadWrite(this._networkConnection).stake(amount));
+              return _context13.abrupt("return", new StakingReadWrite(this._networkConnection).stake(amount));
 
             case 1:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
         }
-      }, _callee11, this);
+      }, _callee13, this);
     }));
 
-    function stake(_x10) {
+    function stake(_x12) {
       return _stake.apply(this, arguments);
     }
 
@@ -6639,22 +7017,22 @@ var SdkReadWrite = /*#__PURE__*/function (_SdkRead) {
   }();
 
   _proto2.unstake = /*#__PURE__*/function () {
-    var _unstake = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee12(amount) {
-      return runtime_1.wrap(function _callee12$(_context12) {
+    var _unstake = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee14(amount) {
+      return runtime_1.wrap(function _callee14$(_context14) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context14.prev = _context14.next) {
             case 0:
-              return _context12.abrupt("return", new StakingReadWrite(this._networkConnection).unstake(amount));
+              return _context14.abrupt("return", new StakingReadWrite(this._networkConnection).unstake(amount));
 
             case 1:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
         }
-      }, _callee12, this);
+      }, _callee14, this);
     }));
 
-    function unstake(_x11) {
+    function unstake(_x13) {
       return _unstake.apply(this, arguments);
     }
 
@@ -6688,5 +7066,5 @@ BigNumber.config({
   DECIMAL_PLACES: 50
 });
 
-export { AIRDROP_END_TIMESTAMP, AIRDROP_KEEP_THRESHOLD, AIRDROP_START_TIMESTAMP, ALL_STAKING_POOLS, AURORA_CHAINID, AURORA_PLUS_API_PREFIX, Airdrop, AirdropRead, AirdropReadWrite, AuriEnv, BORROW_LIMIT_BUFFER, BORROW_NEAR_REWARDS_PER_WEEK, BlockchainEntity, BlockchainEntityRead, BlockchainEntityReadWrite, ComptrollerRewardType, DECIMAL_PRECISION, DEPOSIT_NEAR_REWARDS_PER_WEEK, DEPOSIT_ONLY_TOKENS, ETHAddress, HARDCODE_PRICE_TOKENS, INF, MarketAction, MiscRead, MoneyMarket, MoneyMarketRead, MoneyMarketReadWrite, ONE_DAY, ONE_WEEK, ONE_YEAR, PLYToken, PLYWNEARToken, PLYWNEAR_POOL_ID, PLYWNEAR_REWARD_TOKENS, PRICE_WHITELISTED, Papermill, PapermillRead, PapermillReadWrite, PlyGame, PlyGameRead, PlyGameReadWrite, REFERRAL_CAMPAIGNS, REWARD_CLAIM_START, Referral, ReferralRead, ReferralReadWrite, SDK, SdkRead, SdkReadWrite, Staking, StakingRead, StakingReadWrite, Token, TokenAmount, TransferEventQuery, index as abis, assert, calcLMRewardApr, calcValuation, decimalFactor, decimalRecords, devLog, dummyAddress, dummyMarketAddress, dummyPly, dummyPlyAurora, dummyToken, dummyTokenAmount, dummyTokenAmount2, dummyTokenAmount3, dummyUserMarketDetails, dummyZeroTokenAmount, fetchHistoricalLPPositions, fetchHistoricalLPPrice, fetchHistoricalPULPPrice, fetchHistoricalPrice, fetchHistoricalPriceByLP, fetchHistoricalPriceFromOracle, fetchLPPositions, fetchLPPrice, fetchPLYPrice, fetchPULPPrice, fetchPrice, fetchPriceFromCoingecko, fetchPriceFromCoingeckoAPI, fetchPriceFromDefiLlama, fetchPriceFromDefiLlamaAPI, fetchPriceFromOracle, fetchStNEARPrice, fetchToken0PriceByLP, fetchUnderlyingTokensPrices, fetchValuation, formatObject, getApi, getBlockBeforeTimestamp, getBlockTimestamp, getBlocksTimestamp, getBlocksTimestampViaRPC, getCurrentTimestamp, getDecimal, getPaginatedApi, getQuery, getSymbol, getUnderlying, isSameAddress, networkAddresses, queryGraphQL, referralRewardDummy1, referralRewardDummy2, sleep, sortEvents, symbolRecords, validateAndParseAddress, valuateToken };
+export { AIRDROP_END_TIMESTAMP, AIRDROP_KEEP_THRESHOLD, AIRDROP_START_TIMESTAMP, ALL_STAKING_POOLS, AURORA_CHAINID, AURORA_PLUS_API_PREFIX, Airdrop, AirdropRead, AirdropReadWrite, AuriEnv, BORROW_LIMIT_BUFFER, BORROW_NEAR_REWARDS_PER_WEEK, BlockchainEntity, BlockchainEntityRead, BlockchainEntityReadWrite, CACHE_TIMEOUT, Cache, ComptrollerRewardType, DECIMAL_PRECISION, DEPOSIT_NEAR_REWARDS_PER_WEEK, DEPOSIT_ONLY_TOKENS, ETHAddress, HARDCODE_PRICE_TOKENS, INF, MarketAction, MiscRead, MoneyMarket, MoneyMarketRead, MoneyMarketReadWrite, ONE_DAY, ONE_WEEK, ONE_YEAR, PLYToken, PLYWNEARToken, PLYWNEAR_POOL_ID, PLYWNEAR_REWARD_TOKENS, PRICE_WHITELISTED, Papermill, PapermillRead, PapermillReadWrite, PlyGame, PlyGameRead, PlyGameReadWrite, REFERRAL_CAMPAIGNS, REWARD_CLAIM_START, Referral, ReferralRead, ReferralReadWrite, SDK, SdkRead, SdkReadWrite, Staking, StakingRead, StakingReadWrite, Token, TokenAmount, TransferEventQuery, index as abis, assert, calcLMRewardApr, calcNetApy, calcValuation, decimalFactor, decimalRecords, devLog, dummyAddress, dummyMarketAddress, dummyPly, dummyPlyAurora, dummyToken, dummyTokenAmount, dummyTokenAmount2, dummyTokenAmount3, dummyUserMarketDetails, dummyZeroTokenAmount, fetchHistoricalLPPositions, fetchHistoricalLPPrice, fetchHistoricalPULPPrice, fetchHistoricalPrice, fetchHistoricalPriceByLP, fetchHistoricalPriceFromOracle, fetchLPPositions, fetchLPPrice, fetchPLYPrice, fetchPULPPrice, fetchPrice, fetchPriceFromCoingecko, fetchPriceFromCoingeckoAPI, fetchPriceFromDefiLlama, fetchPriceFromDefiLlamaAPI, fetchPriceFromOracle, fetchStNEARPrice, fetchToken0PriceByLP, fetchUnderlyingTokensPrices, fetchValuation, formatObject, getApi, getBlockBeforeTimestamp, getBlockTimestamp, getBlocksTimestamp, getBlocksTimestampViaRPC, getCurrentTimestamp, getDecimal, getPaginatedApi, getQuery, getSymbol, getUnderlying, isSameAddress, networkAddresses, queryGraphQL, referralRewardDummy1, referralRewardDummy2, sleep, sortEvents, symbolRecords, validateAndParseAddress, valuateToken };
 //# sourceMappingURL=sdk.esm.js.map