@aurigami/sdk 1.0.3-fix → 1.1.0

package/dist/SDK.d.ts

@@ -1,9 +1,9 @@
-import { AuriFairLaunch, AuriLens, Comptroller, TokenLock } from '@aurigami/contracts/typechain';
-import { TransactionResponse } from '@ethersproject/abstract-provider';
 import { BlockchainEntity, BlockchainEntityRead } from './BlockchainEntity';
-import { Token } from './token';
+import { LockingDetails, PlyAuroraPoolDetails, NetworkConnection, UserDetails, UserMarketDetails, CurrencyAmount, HypotheticalStats, MarketAction } from './types';
+import { TransactionResponse } from '@ethersproject/abstract-provider';
+import { AuriFairLaunch, Comptroller, TokenLock, AuriLens } from '@aurigami/contracts/typechain';
 import { TokenAmount } from './tokenAmount';
-import { CurrencyAmount, HypotheticalStats, LockingDetails, MarketAction, NetworkConnection, PlyAuroraPoolDetails, UserDetails, UserMarketDetails } from './types';
+import { Token } from './token';
 export declare class SdkRead extends BlockchainEntityRead {
     protected _comptroller: Comptroller;
     protected _tokenLock: TokenLock;

package/dist/priceFetcher.d.ts

@@ -3,7 +3,7 @@ import { providers, BigNumber as BN } from "ethers";
 import { TokenAmount } from "./tokenAmount";
 import { Address } from "./types";
 export declare function fetchPriceFromCoingeckoAPI(id: string): Promise<BigNumber>;
-export declare function fetchPriceFromCoingecko(address: Address): Promise<BigNumber>;
+export declare function fetchPriceFromCoingecko(id: Address): Promise<BigNumber>;
 export declare function fetchLPPositions(LPAddress: Address, provider: providers.Provider): Promise<{
     token0: Address;
     token1: Address;
@@ -17,6 +17,7 @@ export declare function fetchUnderlyingTokensPrices(provider: providers.Provider
     auToken: string;
     underlyingPrice: BigNumber;
 }[]>;
+export declare function fetchStNEARPrice(): Promise<BigNumber>;
 export declare function fetchPrice(address: Address, provider: providers.Provider): Promise<BigNumber>;
 export declare function fetchValuation(tokenAmount: TokenAmount, provider: providers.Provider): Promise<BigNumber>;
 export declare function calcValuation(tokenAmount: TokenAmount, price: BigNumber): BigNumber;

package/dist/sdk.cjs.development.js

@@ -7,16 +7,16 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var BigNumber = _interopDefault(require('bignumber.js'));
 var ethers = require('ethers');
 var utils = require('ethers/lib/utils');
-var AuriFairLaunchABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuriFairLaunch.sol/AuriFairLaunch.json'));
-var AuriLensABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json'));
-var ComptrollerABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json'));
-var FaucetABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/mock/Faucet.sol/Faucet.json'));
-var TokenLockABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/TokenLock.sol/TokenLock.json'));
 var abstractSigner = require('@ethersproject/abstract-signer');
 var AuErc20ABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/AuErc20.sol/AuErc20.json'));
 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'));
+var FaucetABI = _interopDefault(require('@aurigami/contracts/artifacts/contracts/mock/Faucet.sol/Faucet.json'));
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -900,6 +900,20 @@ var BlockchainEntity = /*#__PURE__*/function () {
   return BlockchainEntity;
 }();
 
+(function (ComptrollerRewardType) {
+  ComptrollerRewardType[ComptrollerRewardType["PLY"] = 0] = "PLY";
+  ComptrollerRewardType[ComptrollerRewardType["AURORA"] = 1] = "AURORA";
+})(exports.ComptrollerRewardType || (exports.ComptrollerRewardType = {}));
+
+(function (MarketAction) {
+  MarketAction[MarketAction["Deposit"] = 0] = "Deposit";
+  MarketAction[MarketAction["Borrow"] = 1] = "Borrow";
+  MarketAction[MarketAction["Withdraw"] = 2] = "Withdraw";
+  MarketAction[MarketAction["Repay"] = 3] = "Repay";
+  MarketAction[MarketAction["EnableCollateral"] = 4] = "EnableCollateral";
+  MarketAction[MarketAction["DisableCollateral"] = 5] = "DisableCollateral";
+})(exports.MarketAction || (exports.MarketAction = {}));
+
 var dummyAddress = "0xDEADbeEfEEeEEEeEEEeEEeeeeeEeEEeeeeEEEEeE";
 var ETHAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 var AURORA_CHAINID = 1313161554;
@@ -929,6 +943,14 @@ var networkAddresses = {
     name: "auWNEAR",
     address: /*#__PURE__*/'0xaE4fac24dCdAE0132C6d04f564dCf059616E9423'.toLowerCase(),
     underlying: /*#__PURE__*/'0xC42C30aC6Cc15faC9bD938618BcaA1a1FaE8501d'.toLowerCase()
+  }, {
+    name: "auSTNEAR",
+    address: /*#__PURE__*/"0x3195949f267702723bc614cAE037cdc8D1E94786".toLowerCase(),
+    underlying: /*#__PURE__*/'0x07f9f7f963c5cd2bbffd30ccfb964be114332e30'.toLowerCase()
+  }, {
+    name: "auAURORA",
+    address: /*#__PURE__*/"0x8888682E24dd4Df7B7Ff2B91fccB575737E433bf".toLowerCase(),
+    underlying: /*#__PURE__*/"0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase()
   }],
   misc: {
     COMPTROLLER: /*#__PURE__*/"0x817af6cfAF35BdC1A634d6cC94eE9e4c68369Aeb".toLowerCase(),
@@ -941,6 +963,7 @@ var networkAddresses = {
   tokens: {
     AURORA: /*#__PURE__*/"0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase(),
     PLY: /*#__PURE__*/"0x981bD5832EAB9C8F607940E0e9faCBf8C09ee20a".toLowerCase(),
+    stNEAR: /*#__PURE__*/"0x07f9f7f963c5cd2bbffd30ccfb964be114332e30".toLowerCase(),
     AURPLY: /*#__PURE__*/dummyAddress.toLowerCase()
   }
 };
@@ -1015,20 +1038,6 @@ function calcLMRewardApr(rewardsValue, totalStakeValue, frequencyPerYear) {
   return rewardsValue.multipliedBy(frequencyPerYear).dividedBy(totalStakeValue);
 }
 
-(function (ComptrollerRewardType) {
-  ComptrollerRewardType[ComptrollerRewardType["PLY"] = 0] = "PLY";
-  ComptrollerRewardType[ComptrollerRewardType["AURORA"] = 1] = "AURORA";
-})(exports.ComptrollerRewardType || (exports.ComptrollerRewardType = {}));
-
-(function (MarketAction) {
-  MarketAction[MarketAction["Deposit"] = 0] = "Deposit";
-  MarketAction[MarketAction["Borrow"] = 1] = "Borrow";
-  MarketAction[MarketAction["Withdraw"] = 2] = "Withdraw";
-  MarketAction[MarketAction["Repay"] = 3] = "Repay";
-  MarketAction[MarketAction["EnableCollateral"] = 4] = "EnableCollateral";
-  MarketAction[MarketAction["DisableCollateral"] = 5] = "DisableCollateral";
-})(exports.MarketAction || (exports.MarketAction = {}));
-
 var Token = function Token(address, decimals) {
   this.address = address.toLowerCase();
   this.decimals = decimals;
@@ -2048,12 +2057,12 @@ function fetchPriceFromCoingecko(_x2) {
 }
 
 function _fetchPriceFromCoingecko() {
-  _fetchPriceFromCoingecko = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(address) {
+  _fetchPriceFromCoingecko = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(id) {
     return runtime_1.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            if (!isSameAddress(address, networkAddresses.tokens.AURORA)) {
+            if (!isSameAddress(id, networkAddresses.tokens.AURORA)) {
               _context2.next = 4;
               break;
             }
@@ -2061,7 +2070,7 @@ function _fetchPriceFromCoingecko() {
             return _context2.abrupt("return", fetchPriceFromCoingeckoAPI('aurora-near'));
 
           case 4:
-            throw Error("Unknown token " + address + " in fetchPriceFromCoingecko");
+            throw Error("Unknown token " + id + " in fetchPriceFromCoingecko");
 
           case 5:
           case "end":
@@ -2239,53 +2248,105 @@ function _fetchUnderlyingTokensPrices() {
   return _fetchUnderlyingTokensPrices.apply(this, arguments);
 }
 
+function fetchStNEARPrice() {
+  return _fetchStNEARPrice.apply(this, arguments);
+}
+
+function _fetchStNEARPrice() {
+  _fetchStNEARPrice = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7() {
+    var ratioPromise, nearPricePromise, _yield$Promise$all, ratioRes, nearPrice, ratio;
+
+    return runtime_1.wrap(function _callee7$(_context7) {
+      while (1) {
+        switch (_context7.prev = _context7.next) {
+          case 0:
+            ratioPromise = axios.get("https://validators.narwallets.com/metrics_json").then(function (res) {
+              return res.data;
+            });
+            nearPricePromise = fetchPriceFromCoingeckoAPI('near');
+            _context7.next = 4;
+            return Promise.all([ratioPromise, nearPricePromise]);
+
+          case 4:
+            _yield$Promise$all = _context7.sent;
+            ratioRes = _yield$Promise$all[0];
+            nearPrice = _yield$Promise$all[1];
+            ratio = new BigNumber(ratioRes.st_near_price);
+            return _context7.abrupt("return", ratio.multipliedBy(nearPrice));
+
+          case 9:
+          case "end":
+            return _context7.stop();
+        }
+      }
+    }, _callee7);
+  }));
+  return _fetchStNEARPrice.apply(this, arguments);
+}
+
 function fetchPrice(_x11, _x12) {
   return _fetchPrice.apply(this, arguments);
 }
 
 function _fetchPrice() {
-  _fetchPrice = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7(address, provider) {
+  _fetchPrice = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8(address, provider) {
     var matchingAuToken;
-    return runtime_1.wrap(function _callee7$(_context7) {
+    return runtime_1.wrap(function _callee8$(_context8) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context8.prev = _context8.next) {
           case 0:
             if (!( isSameAddress(address, networkAddresses.tokens.PLY))) {
-              _context7.next = 2;
+              _context8.next = 2;
               break;
             }
 
-            return _context7.abrupt("return", new BigNumber(0));
+            return _context8.abrupt("return", new BigNumber(0));
 
           case 2:
+            if (!isSameAddress(address, networkAddresses.tokens.stNEAR)) {
+              _context8.next = 4;
+              break;
+            }
+
+            return _context8.abrupt("return", fetchStNEARPrice());
+
+          case 4:
+            if (!isSameAddress(address, networkAddresses.tokens.AURORA)) {
+              _context8.next = 6;
+              break;
+            }
+
+            return _context8.abrupt("return", fetchPriceFromCoingecko(address));
+
+          case 6:
             matchingAuToken = networkAddresses.auTokens.find(function (auToken) {
               return isSameAddress(auToken.underlying, address);
             });
 
             if (!(matchingAuToken !== undefined)) {
-              _context7.next = 7;
+              _context8.next = 11;
               break;
             }
 
-            return _context7.abrupt("return", fetchPriceFromOracle(matchingAuToken.address, getDecimal(address), provider));
+            return _context8.abrupt("return", fetchPriceFromOracle(matchingAuToken.address, getDecimal(address), provider));
 
-          case 7:
+          case 11:
             if (!isSameAddress(address, networkAddresses.tokens.AUPLYLP)) {
-              _context7.next = 11;
+              _context8.next = 15;
               break;
             }
 
-            return _context7.abrupt("return", fetchLPPrice(address, provider));
+            return _context8.abrupt("return", fetchLPPrice(address, provider));
 
-          case 11:
-            return _context7.abrupt("return", fetchPriceFromCoingecko(address));
+          case 15:
+            return _context8.abrupt("return", fetchPriceFromCoingecko(address));
 
-          case 12:
+          case 16:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
       }
-    }, _callee7);
+    }, _callee8);
   }));
   return _fetchPrice.apply(this, arguments);
 }
@@ -2295,25 +2356,25 @@ function fetchValuation(_x13, _x14) {
 }
 
 function _fetchValuation() {
-  _fetchValuation = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8(tokenAmount, provider) {
+  _fetchValuation = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee9(tokenAmount, provider) {
     var price;
-    return runtime_1.wrap(function _callee8$(_context8) {
+    return runtime_1.wrap(function _callee9$(_context9) {
       while (1) {
-        switch (_context8.prev = _context8.next) {
+        switch (_context9.prev = _context9.next) {
           case 0:
-            _context8.next = 2;
+            _context9.next = 2;
             return fetchPrice(tokenAmount.token.address, provider);
 
           case 2:
-            price = _context8.sent;
-            return _context8.abrupt("return", calcValuation(tokenAmount, price));
+            price = _context9.sent;
+            return _context9.abrupt("return", calcValuation(tokenAmount, price));
 
           case 4:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
       }
-    }, _callee8);
+    }, _callee9);
   }));
   return _fetchValuation.apply(this, arguments);
 }
@@ -2651,7 +2712,9 @@ var MoneyMarketRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 depositPlyApy: depositPlyApy.toNumber(),
                 borrowApy: borrowAPY,
                 borrowPlyApy: borrowPlyApy.toNumber(),
-                collateralRatio: collateralRatio
+                collateralRatio: collateralRatio,
+                depositPlyPerWeek: new TokenAmount(PLYToken, rewardSpeeds.plyRewardSupplySpeed.mul(ONE_DAY).mul(7).toString()),
+                BorrowPlyPerWeek: new TokenAmount(PLYToken, rewardSpeeds.plyRewardBorrowSpeed.mul(ONE_DAY).mul(7).toString())
               });
 
             case 14:
@@ -3012,7 +3075,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, 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, borrowLimitMargin, maxWithdrawCap;
 
       return runtime_1.wrap(function _callee2$(_context2) {
         while (1) {
@@ -3085,11 +3148,20 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 if (userMarketDetails[index].isCollateral) return p.plus(v.multipliedBy(userMarketDetails[index].collateralRatio));
                 return p;
               }, new BigNumber(0));
-              _context2.next = 19;
-              return this._comptroller.getAccountLiquidity(userAddress);
+              promises = new Array(3);
+              promises[0] = this._comptroller.getAccountLiquidity(userAddress);
+              promises[1] = this._auriLens.callStatic.claimAndGetRewardBalancesMetadata(this._comptroller.address, this._auriFairLaunch.address, [], {
+                from: userAddress
+              });
+              promises[2] = this._tokenLock.lockedAmounts(userAddress);
+              _context2.next = 23;
+              return Promise.all(promises);
 
-            case 19:
-              accountLiquidity = _context2.sent;
+            case 23:
+              values = _context2.sent;
+              accountLiquidity = values[0];
+              rewardBalancesMetadata = values[1];
+              lockedAmount = values[2];
               borrowedvaluation = totalBorrowLimit.minus(new BigNumber(accountLiquidity[0].toString()).div(decimalFactor(18)));
 
               if (borrowedvaluation.lt("0.00001")) {
@@ -3114,20 +3186,20 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
               }
 
               return _context2.abrupt("return", {
-                markets: [],
+                markets: userMarketDetails,
                 borrowLimit: {
                   currency: "USD",
                   amount: bufferedBorrowLimit.toFixed(DECIMAL_PRECISION)
                 },
-                accruedPly: new TokenAmount(PLYToken, "0"),
-                lockedPly: new TokenAmount(PLYToken, "0"),
+                accruedPly: new TokenAmount(PLYToken, rewardBalancesMetadata.plyAccrued.toString()),
+                lockedPly: new TokenAmount(PLYToken, lockedAmount.toString()),
                 borrowableAmount: {
                   currency: "USD",
                   amount: borrowableAmount.toFixed(DECIMAL_PRECISION)
                 }
               });
 
-            case 27:
+            case 34:
             case "end":
               return _context2.stop();
           }
@@ -3479,6 +3551,7 @@ exports.fetchPrice = fetchPrice;
 exports.fetchPriceFromCoingecko = fetchPriceFromCoingecko;
 exports.fetchPriceFromCoingeckoAPI = fetchPriceFromCoingeckoAPI;
 exports.fetchPriceFromOracle = fetchPriceFromOracle;
+exports.fetchStNEARPrice = fetchStNEARPrice;
 exports.fetchUnderlyingTokensPrices = fetchUnderlyingTokensPrices;
 exports.fetchValuation = fetchValuation;
 exports.formatObject = formatObject;