@aurigami/sdk 0.6.7 → 0.7.0

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, EthRepayHelper } from "@aurigami/contracts/typechain";
+import { AuErc20, AuETH, AuriLens, Comptroller } from "@aurigami/contracts/typechain";
 import { TransactionResponse } from '@ethersproject/abstract-provider';
 import BigNumber from "bignumber.js";
 import { Token } from './token';
@@ -31,8 +31,6 @@ 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>;
@@ -45,6 +43,5 @@ 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/constants.d.ts

@@ -6,7 +6,6 @@ export declare const AURORA_CHAINID = 1313161554;
 export declare const DECIMAL_PRECISION = 10;
 export declare type NetworkAddresses = {
     auTokens: {
-        name: string;
         address: string;
         underlying: string;
     }[];

package/dist/sdk.cjs.development.js

@@ -12,7 +12,6 @@ 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'));
@@ -920,46 +919,38 @@ var AURORA_CHAINID = 1313161554;
 var DECIMAL_PRECISION = 10;
 var networkAddresses = {
   auTokens: [{
-    name: "auUSDC",
-    address: /*#__PURE__*/'0x7A9984522bC81B348d66379ed36Be5BD6147820E'.toLowerCase(),
-    underlying: /*#__PURE__*/'0xe1Db3E2f129539b2399d8Cd9e808305c85f0c82f'.toLowerCase()
+    address: /*#__PURE__*/'0x7D9F7B4734E274Ff10531bBD5aE8fE6069164d28'.toLowerCase(),
+    underlying: /*#__PURE__*/'0xb12bfca5a55806aaf64e99521918a4bf0fc40802'.toLowerCase()
   }, {
-    name: "auETH",
-    address: /*#__PURE__*/'0x0e2E6069231928429F36dCA288466bC738e602b3'.toLowerCase(),
+    address: /*#__PURE__*/'0x580Ac375176A4e9B26977490656c3B2F00Abf624'.toLowerCase(),
     underlying: /*#__PURE__*/ETHAddress.toLowerCase()
   }, {
-    name: "auWBTC",
-    address: /*#__PURE__*/'0x981bD5832EAB9C8F607940E0e9faCBf8C09ee20a'.toLowerCase(),
-    underlying: /*#__PURE__*/'0xA69506eAbdC11BBdAf2259882A02a91B66E6d7E1'.toLowerCase()
+    address: /*#__PURE__*/'0x705b9d83222c4EeDeaD1A0E399cDeB917173E1F6'.toLowerCase(),
+    underlying: /*#__PURE__*/'0xf4eb217ba2454613b15dbdea6e5f22276410e89e'.toLowerCase()
   }, {
-    name: "auUSDT",
-    address: /*#__PURE__*/'0xDACC02a4Ff16Ea3c1515AdbfdCeb7B1F448B79c8'.toLowerCase(),
-    underlying: /*#__PURE__*/'0x4459ED2dEFFe0569AE748aD5D7cFEFDeeF667E87'.toLowerCase()
+    address: /*#__PURE__*/'0xF9739783b767b358b21A1373140296c09271d6F5'.toLowerCase(),
+    underlying: /*#__PURE__*/'0x4988a896b1227218e4a686fde5eabdcabd91571f'.toLowerCase()
   }, {
-    name: "auDAI",
-    address: /*#__PURE__*/'0xC337343d1ac9F77B1305261CCD17e3799F088D4B'.toLowerCase(),
-    underlying: /*#__PURE__*/'0x1c9998C7768517b83136d3b237a31bc69eDc9028'.toLowerCase()
+    address: /*#__PURE__*/'0x4d2c286D74597B13642dd311D1050dFf9E7eF666'.toLowerCase(),
+    underlying: /*#__PURE__*/'0xe3520349f477a5f6eb06107066048508498a291b'.toLowerCase()
   }, {
-    name: "auPLY",
-    address: /*#__PURE__*/'0x5e063B255e2437D75180117905499139a93f16E6'.toLowerCase(),
-    underlying: /*#__PURE__*/'0x3cD388c98FE71fE1a37272279F4b50bF27037E23'.toLowerCase()
+    address: /*#__PURE__*/'0x367E3fD10006bC64D279e5F1F499DcfA92518A35'.toLowerCase(),
+    underlying: /*#__PURE__*/'0x07a4f270836F2B2B5CACb00b09552e690276aC33'.toLowerCase()
   }, {
-    name: "auWNEAR",
-    address: /*#__PURE__*/'0x910fb0AE51761ccCDBbD9ced613e6A4dc571594a'.toLowerCase(),
-    underlying: /*#__PURE__*/'0x01B2EDff9b095DC270beca46E2eFB41a3ecEE169'.toLowerCase()
+    address: /*#__PURE__*/'0x7FDe6C1C53DD4E94a8CD4c60BF1418613c90c42F'.toLowerCase(),
+    underlying: /*#__PURE__*/'0xC42C30aC6Cc15faC9bD938618BcaA1a1FaE8501d'.toLowerCase()
   }],
   misc: {
-    COMPTROLLER: /*#__PURE__*/"0x79e62AAfc1675c9F737Ec4Bb949115bfC8D2E2E6".toLowerCase(),
-    oracle: /*#__PURE__*/"0xAc99efFDF7a8934e35Ad13880D25127c548A7e6d".toLowerCase(),
-    AURIFAIRLAUNCH: /*#__PURE__*/"0xD204fD43bFe4aAEB9aB993c116c1dECdDF1b9F1A".toLowerCase(),
-    AURILENS: /*#__PURE__*/'0x0Aa7Ce0f5D6259412602A230C3Ed83eDc857bDa1'.toLowerCase(),
-    TOKENLOCK: /*#__PURE__*/'0x1b5c4c6A77f784104662B293a0166B27aF71d2c0'.toLowerCase(),
-    FAUCET: /*#__PURE__*/"0xe8b53eE0443620fB8DcEaEB6DE98ED117971c329".toLowerCase(),
-    ETHREPAYHELPER: /*#__PURE__*/"0x0b28E2F1767623f2D5Cd59165e79f83E3D63b71F".toLowerCase()
+    COMPTROLLER: /*#__PURE__*/"0xc77877b0bd08fE3B060EbD8AEE06fb560C91A125".toLowerCase(),
+    oracle: /*#__PURE__*/"0xde76c82a6F99D25bEd226af44cF427e57dE8eE93".toLowerCase(),
+    AURIFAIRLAUNCH: /*#__PURE__*/"0x660159696c9E0B2c17E3e0ac2019F436aE34fc7A".toLowerCase(),
+    AURILENS: /*#__PURE__*/'0x503bD4B6a056F7E66671D2B4620f0aDC4ff2A4e9'.toLowerCase(),
+    TOKENLOCK: /*#__PURE__*/'0xa4623FC7C96B59f9a0a46144324d68C8E8710966'.toLowerCase(),
+    FAUCET: /*#__PURE__*/'0x8F791d611D71699B76C03857A51D7B7E5E66f01E'.toLowerCase()
   },
   tokens: {
-    AURORA: /*#__PURE__*/dummyAddress.toLowerCase(),
-    PLY: /*#__PURE__*/"0x3cD388c98FE71fE1a37272279F4b50bF27037E23".toLowerCase(),
+    AURORA: /*#__PURE__*/"0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase(),
+    PLY: /*#__PURE__*/"0x07a4f270836F2B2B5CACb00b09552e690276aC33".toLowerCase(),
     AURPLY: /*#__PURE__*/dummyAddress.toLowerCase()
   }
 };
@@ -972,19 +963,20 @@ var INF = /*#__PURE__*/ethers.BigNumber.from(2).pow(256).sub(1);
 
 var decimalRecords = {
   '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee': 18,
-  '0xdacc02a4ff16ea3c1515adbfdceb7b1f448b79c8': 8,
-  '0x01b2edff9b095dc270beca46e2efb41a3ecee169': 24,
-  '0x4459ed2deffe0569ae748ad5d7cfefdeef667e87': 6,
-  '0x3cd388c98fe71fe1a37272279f4b50bf27037e23': 18,
-  '0x1c9998c7768517b83136d3b237a31bc69edc9028': 18,
-  '0x7a9984522bc81b348d66379ed36be5bd6147820e': 8,
-  '0x0e2e6069231928429f36dca288466bc738e602b3': 8,
-  '0x981bd5832eab9c8f607940e0e9facbf8c09ee20a': 8,
-  '0xa69506eabdc11bbdaf2259882a02a91b66e6d7e1': 8,
-  '0x910fb0ae51761cccdbbd9ced613e6a4dc571594a': 8,
-  '0xe1db3e2f129539b2399d8cd9e808305c85f0c82f': 6,
-  '0x5e063b255e2437d75180117905499139a93f16e6': 8,
-  '0xc337343d1ac9f77b1305261ccd17e3799f088d4b': 8
+  '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79': 18,
+  '0x4988a896b1227218e4a686fde5eabdcabd91571f': 6,
+  '0xb12bfca5a55806aaf64e99521918a4bf0fc40802': 6,
+  '0x7fde6c1c53dd4e94a8cd4c60bf1418613c90c42f': 8,
+  '0xe3520349f477a5f6eb06107066048508498a291b': 18,
+  '0xf9739783b767b358b21a1373140296c09271d6f5': 8,
+  '0x07a4f270836f2b2b5cacb00b09552e690276ac33': 18,
+  '0xf4eb217ba2454613b15dbdea6e5f22276410e89e': 8,
+  '0x705b9d83222c4eedead1a0e399cdeb917173e1f6': 8,
+  '0x367e3fd10006bc64d279e5f1f499dcfa92518a35': 8,
+  '0x580ac375176a4e9b26977490656c3b2f00abf624': 8,
+  '0x4d2c286d74597b13642dd311d1050dff9e7ef666': 8,
+  '0x7d9f7b4734e274ff10531bbd5ae8fe6069164d28': 8,
+  '0xc42c30ac6cc15fac9bd938618bcaa1a1fae8501d': 24
 };
 
 function formatObject(object) {
@@ -2275,7 +2267,7 @@ function _fetchPrice() {
             return _context7.abrupt("return", fetchPriceFromOracle(matchingAuToken.address, getDecimal(address), provider));
 
           case 7:
-            if (!isSameAddress(address, networkAddresses.tokens.AUPLYLP)) {
+            if (!isSameAddress(address, networkAddresses.misc.AUPLYLP)) {
               _context7.next = 11;
               break;
             }
@@ -2646,8 +2638,24 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
               return Promise.all(promises);
 
             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 = 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);
               return _context9.abrupt("return", {
                 auTokenAddress: this.auToken.address,
                 totalTokenDeposited: totalDeposited,
@@ -2659,7 +2667,7 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 collateralRatio: collateralRatio
               });
 
-            case 14:
+            case 26:
             case "end":
               return _context9.stop();
           }
@@ -2737,12 +2745,8 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
 var MoneyMarketReadWrite = /*#__PURE__*/function (_MoneyMarketRead) {
   _inheritsLoose(MoneyMarketReadWrite, _MoneyMarketRead);
 
-  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;
+  function MoneyMarketReadWrite() {
+    return _MoneyMarketRead.apply(this, arguments) || this;
   }
 
   var _proto2 = MoneyMarketReadWrite.prototype;
@@ -2836,31 +2840,30 @@ 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 (!isSameAddress(amount.token.address, ETHAddress)) {
-                _context15.next = 4;
-                break;
+              if (new BigNumber(amount.rawAmount()).lt(0)) {
+                repayAmount = INF;
+              } else {
+                repayAmount = ethers.BigNumber.from(amount.rawAmount());
               }
 
-              return _context15.abrupt("return", this._EthRepayHelper.connect(this._networkConnection.signer).repayBorrow({
-                value: amount.rawAmount()
-              }));
-
-            case 4:
-              if (!new BigNumber(amount.rawAmount()).lt(0)) {
-                _context15.next = 8;
+              if (!isSameAddress(amount.token.address, ETHAddress)) {
+                _context15.next = 5;
                 break;
               }
 
-              return _context15.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(INF));
+              return _context15.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow({
+                value: repayAmount
+              }));
 
-            case 8:
-              return _context15.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(amount.rawAmount()));
+            case 5:
+              return _context15.abrupt("return", this.auToken.connect(this._networkConnection.signer).repayBorrow(repayAmount));
 
-            case 9:
+            case 6:
             case "end":
               return _context15.stop();
           }
@@ -2927,12 +2930,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;
@@ -2941,10 +2944,6 @@ 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);
 
@@ -3017,7 +3016,7 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     var _getUserDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(userAddress) {
       var _this2 = this;
 
-      var marketCount, userMarketDetails, assetsIn, promises, totalBorrowLimit, pricePromises, _loop2, _iterator, _step, underlyingPrices, depositValues, _loop, i, accountLiquidity, rewardBalancesMetadata, lockedAmount, values, borrowedvaluation, bufferedBorrowLimit, minimumBorrowLimitAllowed, borrowableAmount, auToken, moneyMarket, borrowLimitMargin, maxWithdrawCap;
+      var marketCount, userMarketDetails, assetsIn, promises, totalBorrowLimit, pricePromises, _loop2, _iterator, _step, underlyingPrices, depositValues, _loop, i, accountLiquidity, rewardBalancesMetadata, lockedAmount, values, borrowedvaluation, bufferedBorrowLimit, minimumBorrowLimitAllowed, borrowableAmount, auToken, moneyMarket, maxWithdrawCap;
 
       return runtime_1.wrap(function _callee2$(_context2) {
         while (1) {
@@ -3126,8 +3125,7 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
               for (i = 0; i < marketCount; i++) {
                 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 = totalBorrowLimit.minus(minimumBorrowLimitAllowed).div(userMarketDetails[i].collateralRatio).div(underlyingPrices[i]);
                 userMarketDetails[i].maxWithdrawableAmount = userMarketDetails[i].isCollateral && maxWithdrawCap.lt(userMarketDetails[i].depositBalance.formattedAmount()) ? new TokenAmount(moneyMarket.underlying, maxWithdrawCap.toFixed(24), false) : new TokenAmount(moneyMarket.underlying, userMarketDetails[i].depositBalance.rawAmount());
               }
 
@@ -3346,7 +3344,7 @@ var SdkReadWrite = /*#__PURE__*/function (_SdkRead) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
-              return _context7.abrupt("return", this._auriFairLaunch.connect(this._networkConnection.signer).deposit(AurPlyPid, amount.rawAmount()));
+              return _context7.abrupt("return", this._auriFairLaunch.connect(this._networkConnection.signer).deposit(AurPlyPid, amount.rawAmount(), false));
 
             case 1:
             case "end":