@aurigami/sdk 0.6.6 → 0.6.7

package/dist/MoneyMarket.d.ts

@@ -1,7 +1,7 @@
 import { BlockchainEntity, BlockchainEntityRead } from './BlockchainEntity';
 import { MoneyMarketDetails, NetworkConnection, Address } from './types';
 import { BigNumber as BN } from 'ethers';
-import { AuErc20, AuETH, AuriLens, Comptroller } from "@aurigami/contracts/typechain";
+import { AuErc20, AuETH, AuriLens, Comptroller, EthRepayHelper } from "@aurigami/contracts/typechain";
 import { TransactionResponse } from '@ethersproject/abstract-provider';
 import BigNumber from "bignumber.js";
 import { Token } from './token';
@@ -31,6 +31,8 @@ export declare class MoneyMarketRead extends BlockchainEntityRead {
     getUserDepositBalance(userAddress: string): Promise<TokenAmount>;
 }
 export declare class MoneyMarketReadWrite extends MoneyMarketRead {
+    protected _EthRepayHelper: EthRepayHelper;
+    constructor(networkConnection: NetworkConnection, auToken: Address, underlyingAsset: Address);
     deposit(amount: TokenAmount): Promise<TransactionResponse>;
     borrow(amount: TokenAmount): Promise<TransactionResponse>;
     withdraw(amount: TokenAmount): Promise<TransactionResponse>;
@@ -43,5 +45,6 @@ export declare class MoneyMarket extends BlockchainEntity {
     protected underlying: Address;
     constructor(address: string, underlying: string);
     read(networkConnection: NetworkConnection): MoneyMarketRead;
+    readWrite(networkConnection: NetworkConnection): MoneyMarketReadWrite;
 }
 export {};

package/dist/sdk.cjs.development.js

@@ -12,6 +12,7 @@ var AuErc20ABI = _interopDefault(require('@aurigami/contracts/artifacts/contract
 var AuETHABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuETH.sol/AuETH.json'));
 var ComptrollerABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json'));
 var AuriLensABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json'));
+var EthRepayHelperABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/EthRepayHelper.sol/EthRepayHelper.json'));
 var axios = _interopDefault(require('axios'));
 var TokenLockABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/TokenLock.sol/TokenLock.json'));
 var AuriFairLaunchABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuriFairLaunch.sol/AuriFairLaunch.json'));
@@ -953,7 +954,8 @@ var networkAddresses = {
     AURIFAIRLAUNCH: /*#__PURE__*/"0xD204fD43bFe4aAEB9aB993c116c1dECdDF1b9F1A".toLowerCase(),
     AURILENS: /*#__PURE__*/'0x0Aa7Ce0f5D6259412602A230C3Ed83eDc857bDa1'.toLowerCase(),
     TOKENLOCK: /*#__PURE__*/'0x1b5c4c6A77f784104662B293a0166B27aF71d2c0'.toLowerCase(),
-    FAUCET: /*#__PURE__*/"0xe8b53eE0443620fB8DcEaEB6DE98ED117971c329".toLowerCase()
+    FAUCET: /*#__PURE__*/"0xe8b53eE0443620fB8DcEaEB6DE98ED117971c329".toLowerCase(),
+    ETHREPAYHELPER: /*#__PURE__*/"0x0b28E2F1767623f2D5Cd59165e79f83E3D63b71F".toLowerCase()
   },
   tokens: {
     AURORA: /*#__PURE__*/dummyAddress.toLowerCase(),
@@ -2644,24 +2646,8 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
               return Promise.all(promises);
 
             case 11:
-              _context9.t0 = calcLMRewardApr;
-              _context9.next = 14;
-              return calcValuation(new TokenAmount(PLYToken, rewardSpeeds.plyRewardBorrowSpeed.toString()), plyPrice);
-
-            case 14:
-              _context9.t1 = _context9.sent;
-              _context9.t2 = underlyingPrice.multipliedBy(totalBorrowed.formattedAmount());
-              _context9.t3 = ONE_YEAR;
-              borrowPlyApy = (0, _context9.t0)(_context9.t1, _context9.t2, _context9.t3);
-              _context9.t4 = calcLMRewardApr;
-              _context9.next = 21;
-              return calcValuation(new TokenAmount(PLYToken, rewardSpeeds.plyRewardSupplySpeed.toString()), plyPrice);
-
-            case 21:
-              _context9.t5 = _context9.sent;
-              _context9.t6 = underlyingPrice.multipliedBy(totalDeposited.formattedAmount());
-              _context9.t7 = ONE_YEAR;
-              depositPlyApy = (0, _context9.t4)(_context9.t5, _context9.t6, _context9.t7);
+              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);
               return _context9.abrupt("return", {
                 auTokenAddress: this.auToken.address,
                 totalTokenDeposited: totalDeposited,
@@ -2673,7 +2659,7 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 collateralRatio: collateralRatio
               });
 
-            case 26:
+            case 14:
             case "end":
               return _context9.stop();
           }
@@ -2751,8 +2737,12 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
 var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   _inheritsLoose(MoneyMarketReadWrite, _MoneyMarketRead);
 
-  function MoneyMarketReadWrite() {
-    return _MoneyMarketRead.apply(this, arguments) || this;
+  function MoneyMarketReadWrite(networkConnection, auToken, underlyingAsset) {
+    var _this3;
+
+    _this3 = _MoneyMarketRead.call(this, networkConnection, auToken, underlyingAsset) || this;
+    _this3._EthRepayHelper = new ethers.Contract(networkAddresses.misc.ETHREPAYHELPER, EthRepayHelperABI.abi, networkConnection.provider);
+    return _this3;
   }
 
   var _proto2 = MoneyMarketReadWrite.prototype;
@@ -2846,61 +2836,31 @@ var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
 
   _proto2.repay = /*#__PURE__*/function () {
     var _repay = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee15(amount) {
-      var repayAmount;
       return runtime_1.wrap(function _callee15$(_context15) {
         while (1) {
           switch (_context15.prev = _context15.next) {
             case 0:
-              if (!new BigNumber(amount.rawAmount()).lt(0)) {
-                _context15.next = 16;
-                break;
-              }
-
               if (!isSameAddress(amount.token.address, ETHAddress)) {
-                _context15.next = 13;
+                _context15.next = 4;
                 break;
               }
 
-              _context15.t0 = ethers.BigNumber;
-              _context15.t1 = this;
-              _context15.next = 6;
-              return this._networkConnection.signer.getAddress();
-
-            case 6:
-              _context15.t2 = _context15.sent;
-              _context15.next = 9;
-              return _context15.t1.getUserBorrowBalance.call(_context15.t1, _context15.t2);
-
-            case 9:
-              _context15.t3 = _context15.sent.rawAmount();
-              repayAmount = _context15.t0.from.call(_context15.t0, _context15.t3);
-              _context15.next = 14;
-              break;
-
-            case 13:
-              repayAmount = INF;
-
-            case 14:
-              _context15.next = 17;
-              break;
-
-            case 16:
-              repayAmount = ethers.BigNumber.from(amount.rawAmount());
+              return _context15.abrupt("return", this._EthRepayHelper.connect(this._networkConnection.signer).repayBorrow({
+                value: amount.rawAmount()
+              }));
 
-            case 17:
-              if (!isSameAddress(amount.token.address, ETHAddress)) {
-                _context15.next = 21;
+            case 4:
+              if (!new BigNumber(amount.rawAmount()).lt(0)) {
+                _context15.next = 8;
                 break;
               }
 
-              return _context15.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow({
-                value: repayAmount
-              }));
+              return _context15.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(INF));
 
-            case 21:
-              return _context15.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(repayAmount));
+            case 8:
+              return _context15.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(amount.rawAmount()));
 
-            case 22:
+            case 9:
             case "end":
               return _context15.stop();
           }
@@ -2967,12 +2927,12 @@ var MoneyMarket = /*#__PURE__*/function (_BlockchainEntity) {
   _inheritsLoose(MoneyMarket, _BlockchainEntity);
 
   function MoneyMarket(address, underlying) {
-    var _this3;
+    var _this4;
 
-    _this3 = _BlockchainEntity.call(this) || this;
-    _this3.address = validateAndParseAddress(address);
-    _this3.underlying = validateAndParseAddress(underlying);
-    return _this3;
+    _this4 = _BlockchainEntity.call(this) || this;
+    _this4.address = validateAndParseAddress(address);
+    _this4.underlying = validateAndParseAddress(underlying);
+    return _this4;
   }
 
   var _proto3 = MoneyMarket.prototype;
@@ -2981,6 +2941,10 @@ var MoneyMarket = /*#__PURE__*/function (_BlockchainEntity) {
     return new MoneyMarketRead(networkConnection, this.address, this.underlying);
   };
 
+  _proto3.readWrite = function readWrite(networkConnection) {
+    return new MoneyMarketReadWrite(networkConnection, this.address, this.underlying);
+  };
+
   return MoneyMarket;
 }(BlockchainEntity);