@aurigami/sdk 1.16.0 → 1.16.1

package/dist/consts/constants.d.ts

@@ -87,6 +87,7 @@ export declare const networkAddresses: {
         readonly PLY_WNEAR: string;
         readonly WNEAR_TRI: string;
         readonly AURORA_WNEAR: string;
+        readonly NEARX: string;
     };
 };
 export declare const DEPOSIT_ONLY_TOKENS: string[];

package/dist/interactors/MoneyMarket.d.ts

@@ -28,6 +28,7 @@ export declare class MoneyMarketRead extends BlockchainEntityRead {
     getDepositNearAPY(): Promise<BigNumber>;
     getBorrowNearAPY(): Promise<BigNumber>;
     getDepositMetaAPY(): Promise<BigNumber>;
+    getDepositStaderAPY(): Promise<BigNumber>;
     getDetails(): Promise<MoneyMarketDetails>;
     getUserBorrowBalance(userAddress: string): Promise<TokenAmount>;
     getUserDepositBalance(userAddress: string): Promise<TokenAmount>;

package/dist/sdk.cjs.development.js

@@ -138,7 +138,8 @@ var networkAddresses = {
     USN: /*#__PURE__*/'0x5183e1b1091804bc2602586919e6880ac1cf2896'.toLowerCase(),
     PLY_WNEAR: /*#__PURE__*/'0x044b6b0cd3bb13d2b9057781df4459c66781dce7'.toLowerCase(),
     WNEAR_TRI: /*#__PURE__*/'0x84b123875f0f36b966d0b6ca14b31121bd9676ad'.toLowerCase(),
-    AURORA_WNEAR: /*#__PURE__*/'0x1e0e812fbcd3eb75d8562ad6f310ed94d258d008'.toLowerCase()
+    AURORA_WNEAR: /*#__PURE__*/'0x1e0e812fbcd3eb75d8562ad6f310ed94d258d008'.toLowerCase(),
+    NEARX: /*#__PURE__*/'0xb39eeb9e168ef6c639f5e282fef1f6bc4dcae375'.toLowerCase()
   }
 };
 var DEPOSIT_ONLY_TOKENS = [/*#__PURE__*/MAINNET_ADDRESSES.auTokens.AURORA.toLowerCase(), /*#__PURE__*/MAINNET_ADDRESSES.auTokens.TRI.toLowerCase(), /*#__PURE__*/MAINNET_ADDRESSES.auTokens.PLY.toLowerCase(), /*#__PURE__*/MAINNET_ADDRESSES.auTokens.USN.toLowerCase()]; // All token that we can calculate the price via oracle + coingecko
@@ -3732,36 +3733,88 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     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;
+  _proto.getDepositStaderAPY = /*#__PURE__*/function () {
+    var _getDepositStaderAPY = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee14() {
+      var rewardStartTime, currentTime, _yield$Promise$all7, totalDeposited, underlyingPrice, depositStaderApy;
 
       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()]);
+              rewardStartTime = 1675371600;
+              currentTime = getCurrentTimestamp();
 
-            case 2:
+              if (!(currentTime < rewardStartTime)) {
+                _context14.next = 4;
+                break;
+              }
+
+              return _context14.abrupt("return", new BigNumber(0));
+
+            case 4:
+              _context14.next = 6;
+              return Promise.all([this.getTotalTokenDeposited(), fetchPrice(this.underlying.address, this._networkConnection.provider)]);
+
+            case 6:
               _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()]);
+              underlyingPrice = _yield$Promise$all7[1];
+
+              if (isSameAddress(this.underlying.address, networkAddresses.tokens.NEARX)) {
+                // 100$ a day
+                depositStaderApy = calcLMRewardApr(new BigNumber(100), underlyingPrice.multipliedBy(totalDeposited.formattedAmount()), 365);
+              } else {
+                depositStaderApy = new BigNumber(0);
+              }
+
+              return _context14.abrupt("return", depositStaderApy);
 
             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", {
+            case "end":
+              return _context14.stop();
+          }
+        }
+      }, _callee14, this);
+    }));
+
+    function getDepositStaderAPY() {
+      return _getDepositStaderAPY.apply(this, arguments);
+    }
+
+    return getDepositStaderAPY;
+  }();
+
+  _proto.getDetails = /*#__PURE__*/function () {
+    var _getDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee15() {
+      var _yield$Promise$all8, totalDeposited, totalBorrowed, depositAPY, borrowAPY, collateralRatio, rewardSpeeds, _yield$Promise$all9, depositPlyAPY, borrowPlyAPY, depositNearAPY, borrowNearAPY, depositMetaAPY, staderDepositApy;
+
+      return runtime_1.wrap(function _callee15$(_context15) {
+        while (1) {
+          switch (_context15.prev = _context15.next) {
+            case 0:
+              _context15.next = 2;
+              return Promise.all([this.getTotalTokenDeposited(), this.getTotalTokenBorrowed(), this.getDepositAPY(), this.getBorrowAPY(), this.getCollateralRatio(), this.getRewardSpeeds()]);
+
+            case 2:
+              _yield$Promise$all8 = _context15.sent;
+              totalDeposited = _yield$Promise$all8[0];
+              totalBorrowed = _yield$Promise$all8[1];
+              depositAPY = _yield$Promise$all8[2];
+              borrowAPY = _yield$Promise$all8[3];
+              collateralRatio = _yield$Promise$all8[4];
+              rewardSpeeds = _yield$Promise$all8[5];
+              _context15.next = 11;
+              return Promise.all([this.getDepositPlyAPY(), this.getBorrowPlyAPY(), this.getDepositNearAPY(), this.getBorrowNearAPY(), this.getDepositMetaAPY(), this.getDepositStaderAPY()]);
+
+            case 11:
+              _yield$Promise$all9 = _context15.sent;
+              depositPlyAPY = _yield$Promise$all9[0];
+              borrowPlyAPY = _yield$Promise$all9[1];
+              depositNearAPY = _yield$Promise$all9[2];
+              borrowNearAPY = _yield$Promise$all9[3];
+              depositMetaAPY = _yield$Promise$all9[4];
+              staderDepositApy = _yield$Promise$all9[5];
+              return _context15.abrupt("return", {
                 auTokenAddress: this.auToken.address,
                 totalTokenDeposited: totalDeposited,
                 totalTokenBorrowed: totalBorrowed,
@@ -3774,15 +3827,16 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 borrowPlyPerWeek: new TokenAmount(PLYToken, rewardSpeeds.plyRewardBorrowSpeed.mul(ONE_DAY).mul(7).toString()),
                 depositNEARApy: depositNearAPY.toNumber(),
                 borrowNEARApy: borrowNearAPY.toNumber() * -1,
-                depositMETAApy: depositMetaAPY.toNumber()
+                depositMETAApy: depositMetaAPY.toNumber(),
+                staderDepositApy: staderDepositApy.toNumber()
               });
 
-            case 18:
+            case 19:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
         }
-      }, _callee14, this);
+      }, _callee15, this);
     }));
 
     function getDetails() {
@@ -3793,25 +3847,25 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getUserBorrowBalance = /*#__PURE__*/function () {
-    var _getUserBorrowBalance = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee15(userAddress) {
+    var _getUserBorrowBalance = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee16(userAddress) {
       var totalBorrow;
-      return runtime_1.wrap(function _callee15$(_context15) {
+      return runtime_1.wrap(function _callee16$(_context16) {
         while (1) {
-          switch (_context15.prev = _context15.next) {
+          switch (_context16.prev = _context16.next) {
             case 0:
-              _context15.next = 2;
+              _context16.next = 2;
               return this.auToken.callStatic.borrowBalanceCurrent(userAddress);
 
             case 2:
-              totalBorrow = _context15.sent;
-              return _context15.abrupt("return", new TokenAmount(this.underlying, totalBorrow.toString()));
+              totalBorrow = _context16.sent;
+              return _context16.abrupt("return", new TokenAmount(this.underlying, totalBorrow.toString()));
 
             case 4:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
         }
-      }, _callee15, this);
+      }, _callee16, this);
     }));
 
     function getUserBorrowBalance(_x) {
@@ -3822,25 +3876,25 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.getUserDepositBalance = /*#__PURE__*/function () {
-    var _getUserDepositBalance = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee16(userAddress) {
+    var _getUserDepositBalance = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee17(userAddress) {
       var totalDeposit;
-      return runtime_1.wrap(function _callee16$(_context16) {
+      return runtime_1.wrap(function _callee17$(_context17) {
         while (1) {
-          switch (_context16.prev = _context16.next) {
+          switch (_context17.prev = _context17.next) {
             case 0:
-              _context16.next = 2;
+              _context17.next = 2;
               return this.auToken.callStatic.balanceOfUnderlying(userAddress);
 
             case 2:
-              totalDeposit = _context16.sent;
-              return _context16.abrupt("return", new TokenAmount(this.underlying, totalDeposit.toString()));
+              totalDeposit = _context17.sent;
+              return _context17.abrupt("return", new TokenAmount(this.underlying, totalDeposit.toString()));
 
             case 4:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
         }
-      }, _callee16, this);
+      }, _callee17, this);
     }));
 
     function getUserDepositBalance(_x2) {
@@ -3885,26 +3939,26 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   };
 
   _proto.mintCap = /*#__PURE__*/function () {
-    var _mintCap = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee17() {
-      return runtime_1.wrap(function _callee17$(_context17) {
+    var _mintCap = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee18() {
+      return runtime_1.wrap(function _callee18$(_context18) {
         while (1) {
-          switch (_context17.prev = _context17.next) {
+          switch (_context18.prev = _context18.next) {
             case 0:
-              _context17.t0 = TokenAmount;
-              _context17.t1 = this.underlying;
-              _context17.next = 4;
+              _context18.t0 = TokenAmount;
+              _context18.t1 = this.underlying;
+              _context18.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));
+              _context18.t2 = _context18.sent.toString();
+              return _context18.abrupt("return", new _context18.t0(_context18.t1, _context18.t2));
 
             case 6:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
         }
-      }, _callee17, this);
+      }, _callee18, this);
     }));
 
     function mintCap() {
@@ -3915,26 +3969,26 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _proto.borrowCap = /*#__PURE__*/function () {
-    var _borrowCap = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee18() {
-      return runtime_1.wrap(function _callee18$(_context18) {
+    var _borrowCap = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee19() {
+      return runtime_1.wrap(function _callee19$(_context19) {
         while (1) {
-          switch (_context18.prev = _context18.next) {
+          switch (_context19.prev = _context19.next) {
             case 0:
-              _context18.t0 = TokenAmount;
-              _context18.t1 = this.underlying;
-              _context18.next = 4;
+              _context19.t0 = TokenAmount;
+              _context19.t1 = this.underlying;
+              _context19.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));
+              _context19.t2 = _context19.sent.toString();
+              return _context19.abrupt("return", new _context19.t0(_context19.t1, _context19.t2));
 
             case 6:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
         }
-      }, _callee18, this);
+      }, _callee19, this);
     }));
 
     function borrowCap() {
@@ -3945,27 +3999,27 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _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;
+    var _getApyWithoutIncentive = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee20(userAddress) {
+      var _yield$Promise$all10, price, depositApy, borrowApy, depositBalance, borrowBalance, suppliedValue, borrowedValue, sum;
 
-      return runtime_1.wrap(function _callee19$(_context19) {
+      return runtime_1.wrap(function _callee20$(_context20) {
         while (1) {
-          switch (_context19.prev = _context19.next) {
+          switch (_context20.prev = _context20.next) {
             case 0:
-              _context19.next = 2;
+              _context20.next = 2;
               return Promise.all([this.getUnderlyingPrice(), this.getDepositAPY(), this.getBorrowAPY(), this.getUserDepositBalance(userAddress), this.getUserBorrowBalance(userAddress)]);
 
             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];
+              _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];
               suppliedValue = price.multipliedBy(depositBalance.formattedAmount());
               borrowedValue = price.multipliedBy(borrowBalance.formattedAmount());
               sum = calcNetApy(suppliedValue, depositApy, borrowedValue, borrowApy);
-              return _context19.abrupt("return", {
+              return _context20.abrupt("return", {
                 sum: sum,
                 suppliedValue: suppliedValue,
                 borrowedValue: borrowedValue
@@ -3973,10 +4027,10 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
 
             case 12:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
         }
-      }, _callee19, this);
+      }, _callee20, this);
     }));
 
     function getApyWithoutIncentive(_x3) {
@@ -3987,45 +4041,50 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   }();
 
   _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;
+    var _getApyWithIncentive = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee21(userAddress) {
+      var _yield$Promise$all11, price, depositApy, borrowApy, depositBalance, borrowBalance, nearDepositApy, plyDepositApy, metaDepositApy, nearBorrowApy, plyBorrowApy, staderDepositApy, suppliedValue, borrowedValue, totalDepositApy, totalBorrowApy, sum;
 
-      return runtime_1.wrap(function _callee20$(_context20) {
+      return runtime_1.wrap(function _callee21$(_context21) {
         while (1) {
-          switch (_context20.prev = _context20.next) {
+          switch (_context21.prev = _context21.next) {
             case 0:
-              _context20.next = 2;
+              _context21.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 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];
+              _yield$Promise$all11 = _context21.sent;
+              price = _yield$Promise$all11[0];
+              depositApy = _yield$Promise$all11[1];
+              borrowApy = _yield$Promise$all11[2];
+              depositBalance = _yield$Promise$all11[3];
+              borrowBalance = _yield$Promise$all11[4];
+              nearDepositApy = _yield$Promise$all11[5];
+              plyDepositApy = _yield$Promise$all11[6];
+              metaDepositApy = _yield$Promise$all11[7];
+              nearBorrowApy = _yield$Promise$all11[8];
+              plyBorrowApy = _yield$Promise$all11[9];
+              _context21.next = 15;
+              return this.getDepositStaderAPY();
+
+            case 15:
+              staderDepositApy = _context21.sent;
               suppliedValue = price.multipliedBy(depositBalance.formattedAmount());
               borrowedValue = price.multipliedBy(borrowBalance.formattedAmount());
-              totalDepositApy = depositApy.plus(nearDepositApy).plus(plyDepositApy).plus(metaDepositApy);
+              totalDepositApy = depositApy.plus(nearDepositApy).plus(plyDepositApy).plus(metaDepositApy).plus(staderDepositApy);
               totalBorrowApy = borrowApy.plus(nearBorrowApy).plus(plyBorrowApy);
               sum = calcNetApy(suppliedValue, totalDepositApy, borrowedValue, totalBorrowApy);
-              return _context20.abrupt("return", {
+              return _context21.abrupt("return", {
                 sum: sum,
                 suppliedValue: suppliedValue,
                 borrowedValue: borrowedValue
               });
 
-            case 19:
+            case 22:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
         }
-      }, _callee20, this);
+      }, _callee21, this);
     }));
 
     function getApyWithIncentive(_x4) {
@@ -4103,6 +4162,11 @@ tslib.__decorate([cacheDecorator.cache({
   type: cacheDecorator.CacheType.MEMO
 }), tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getDepositMetaAPY", null);
 
+tslib.__decorate([cacheDecorator.cache({
+  ttl: CACHE_TIMEOUT,
+  type: cacheDecorator.CacheType.MEMO
+}), tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", Promise)], MoneyMarketRead.prototype, "getDepositStaderAPY", null);
+
 var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   _inheritsLoose(MoneyMarketReadWrite, _MoneyMarketRead);
 
@@ -4117,29 +4181,29 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   var _proto2 = MoneyMarketReadWrite.prototype;
 
   _proto2.deposit = /*#__PURE__*/function () {
-    var _deposit = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee21(amount) {
-      return runtime_1.wrap(function _callee21$(_context21) {
+    var _deposit = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee22(amount) {
+      return runtime_1.wrap(function _callee22$(_context22) {
         while (1) {
-          switch (_context21.prev = _context21.next) {
+          switch (_context22.prev = _context22.next) {
             case 0:
               if (!isSameAddress(amount.token.address, ETHAddress)) {
-                _context21.next = 4;
+                _context22.next = 4;
                 break;
               }
 
-              return _context21.abrupt("return", this.auToken.connect(this._networkConnection.signer).mint({
+              return _context22.abrupt("return", this.auToken.connect(this._networkConnection.signer).mint({
                 value: amount.rawAmount()
               }));
 
             case 4:
-              return _context21.abrupt("return", this.auToken.connect(this._networkConnection.signer).mint(amount.rawAmount()));
+              return _context22.abrupt("return", this.auToken.connect(this._networkConnection.signer).mint(amount.rawAmount()));
 
             case 5:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
         }
-      }, _callee21, this);
+      }, _callee22, this);
     }));
 
     function deposit(_x5) {
@@ -4150,19 +4214,19 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.borrow = /*#__PURE__*/function () {
-    var _borrow = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee22(amount) {
-      return runtime_1.wrap(function _callee22$(_context22) {
+    var _borrow = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee23(amount) {
+      return runtime_1.wrap(function _callee23$(_context23) {
         while (1) {
-          switch (_context22.prev = _context22.next) {
+          switch (_context23.prev = _context23.next) {
             case 0:
-              return _context22.abrupt("return", this.auToken.connect(this._networkConnection.signer).borrow(amount.rawAmount()));
+              return _context23.abrupt("return", this.auToken.connect(this._networkConnection.signer).borrow(amount.rawAmount()));
 
             case 1:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
         }
-      }, _callee22, this);
+      }, _callee23, this);
     }));
 
     function borrow(_x6) {
@@ -4173,27 +4237,27 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.withdraw = /*#__PURE__*/function () {
-    var _withdraw = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee23(amount) {
-      return runtime_1.wrap(function _callee23$(_context23) {
+    var _withdraw = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee24(amount) {
+      return runtime_1.wrap(function _callee24$(_context24) {
         while (1) {
-          switch (_context23.prev = _context23.next) {
+          switch (_context24.prev = _context24.next) {
             case 0:
               if (!new BigNumber(amount.rawAmount()).lt(0)) {
-                _context23.next = 2;
+                _context24.next = 2;
                 break;
               }
 
-              return _context23.abrupt("return", this.auToken.connect(this._networkConnection.signer).redeemUnderlying(INF));
+              return _context24.abrupt("return", this.auToken.connect(this._networkConnection.signer).redeemUnderlying(INF));
 
             case 2:
-              return _context23.abrupt("return", this.auToken.connect(this._networkConnection.signer).redeemUnderlying(amount.rawAmount()));
+              return _context24.abrupt("return", this.auToken.connect(this._networkConnection.signer).redeemUnderlying(amount.rawAmount()));
 
             case 3:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
         }
-      }, _callee23, this);
+      }, _callee24, this);
     }));
 
     function withdraw(_x7) {
@@ -4204,37 +4268,37 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.repay = /*#__PURE__*/function () {
-    var _repay = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee24(amount) {
-      return runtime_1.wrap(function _callee24$(_context24) {
+    var _repay = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee25(amount) {
+      return runtime_1.wrap(function _callee25$(_context25) {
         while (1) {
-          switch (_context24.prev = _context24.next) {
+          switch (_context25.prev = _context25.next) {
             case 0:
               if (!isSameAddress(amount.token.address, ETHAddress)) {
-                _context24.next = 4;
+                _context25.next = 4;
                 break;
               }
 
-              return _context24.abrupt("return", this._EthRepayHelper.connect(this._networkConnection.signer).repayBorrow({
+              return _context25.abrupt("return", this._EthRepayHelper.connect(this._networkConnection.signer).repayBorrow({
                 value: amount.rawAmount()
               }));
 
             case 4:
               if (!new BigNumber(amount.rawAmount()).lt(0)) {
-                _context24.next = 8;
+                _context25.next = 8;
                 break;
               }
 
-              return _context24.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(INF));
+              return _context25.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(INF));
 
             case 8:
-              return _context24.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(amount.rawAmount()));
+              return _context25.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(amount.rawAmount()));
 
             case 9:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
         }
-      }, _callee24, this);
+      }, _callee25, this);
     }));
 
     function repay(_x8) {
@@ -4245,19 +4309,19 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.enableCollateral = /*#__PURE__*/function () {
-    var _enableCollateral = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee25() {
-      return runtime_1.wrap(function _callee25$(_context25) {
+    var _enableCollateral = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee26() {
+      return runtime_1.wrap(function _callee26$(_context26) {
         while (1) {
-          switch (_context25.prev = _context25.next) {
+          switch (_context26.prev = _context26.next) {
             case 0:
-              return _context25.abrupt("return", this.env.comptroller.connect(this._networkConnection.signer).enterMarkets([this.auToken.address]));
+              return _context26.abrupt("return", this.env.comptroller.connect(this._networkConnection.signer).enterMarkets([this.auToken.address]));
 
             case 1:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
         }
-      }, _callee25, this);
+      }, _callee26, this);
     }));
 
     function enableCollateral() {
@@ -4268,19 +4332,19 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   }();
 
   _proto2.disableCollateral = /*#__PURE__*/function () {
-    var _disableCollateral = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee26() {
-      return runtime_1.wrap(function _callee26$(_context26) {
+    var _disableCollateral = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee27() {
+      return runtime_1.wrap(function _callee27$(_context27) {
         while (1) {
-          switch (_context26.prev = _context26.next) {
+          switch (_context27.prev = _context27.next) {
             case 0:
-              return _context26.abrupt("return", this.env.comptroller.connect(this._networkConnection.signer).exitMarket(this.auToken.address));
+              return _context27.abrupt("return", this.env.comptroller.connect(this._networkConnection.signer).exitMarket(this.auToken.address));
 
             case 1:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
         }
-      }, _callee26, this);
+      }, _callee27, this);
     }));
 
     function disableCollateral() {