@aurigami/sdk 1.8.5 → 1.9.0

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.5",
+  "version": "1.9.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -70,4 +70,4 @@
   "jest": {
     "testURL": "https://app.aurigami.finance"
   }
-}
+}

package/src/SDK.ts

@@ -1,8 +1,8 @@
 import { TransactionResponse } from '@ethersproject/abstract-provider';
 import BigNumber from 'bignumber.js';
 import { ALL_STAKING_POOLS } from './consts';
-import { MiscRead, StakingRead, StakingReadWrite } from './contracts';
 import { AuriEnv, BlockchainEntity, BlockchainEntityRead, Token, TokenAmount } from './entities';
+import { MiscRead, StakingRead, StakingReadWrite } from './interactors';
 import * as types from './types';
 
 export class SdkRead extends BlockchainEntityRead {

package/src/entities/tokenAmount.ts

@@ -17,8 +17,10 @@ export class TokenAmount {
   }
 
   public formattedAmount(decimal?: number, fmt?: BigNumber.Format): string {
-    if (decimal && fmt) {
-      return new BigNumber(this.rawAmnt).div(decimalFactor(decimal)).toFormat(decimal, fmt);
+    if (decimal !== undefined && fmt !== undefined) {
+      return new BigNumber(this.rawAmnt)
+        .div(decimalFactor(this.token.decimals))
+        .toFormat(decimal, fmt);
     }
 
     return new BigNumber(this.rawAmnt).div(decimalFactor(this.token.decimals)).toString();

package/src/helpers/priceFetcher.ts

@@ -18,10 +18,14 @@ export async function fetchPriceFromCoingeckoAPI(id: string): Promise<BigNumber>
   const price = await axios
     .get(`https://api.coingecko.com/api/v3/simple/price?ids=${id}&vs_currencies=usd`)
     .then((res: any) => {
-      return res.data;
+      return res.data[id];
+    })
+    .catch((err: any) => {
+      console.log(`Unable to fetch price from Coingecko API for ${id}`);
+      return { usd: 0 };
     });
 
-  return new BigNumber(price[id].usd);
+  return new BigNumber(price.usd);
 }
 
 export async function fetchPriceFromCoingecko(id: Address): Promise<BigNumber> {
@@ -117,6 +121,19 @@ export async function fetchLPPrice(
   }
 }
 
+export async function fetchStNEARPrice(): Promise<BigNumber> {
+  const ratioPromise = axios
+    .get('https://validators.narwallets.com/metrics_json')
+    .then((res) => res.data);
+  const nearPricePromise = fetchPriceFromCoingeckoAPI('near');
+  const [ratioRes, nearPrice]: [any, BigNumber] = await Promise.all([
+    ratioPromise,
+    nearPricePromise,
+  ]);
+  const ratio = new BigNumber(ratioRes.st_near_price);
+  return ratio.multipliedBy(nearPrice);
+}
+
 function processPriceFromOracle(rawPrice: BN, underlyingDecimal: number) {
   return new BigNumber(rawPrice.toString()).div(decimalFactor(36 - underlyingDecimal));
 }
@@ -130,7 +147,22 @@ export async function fetchPriceFromOracle(
     AuriOracleABI.abi,
     provider
   ) as PriceOracle;
-  const rawPrice = await oracleContract.getUnderlyingPrice(auTokenAddress);
+  const rawPrice = await oracleContract.getUnderlyingPrice(auTokenAddress).catch((e: any) => {
+    console.log(`Unable to fetch price from oracle for ${auTokenAddress}`);
+    return BN.from(0);
+  });
+
+  // In case of error, probally it is because the underlying token is not supported
+  // by the backup oracle. In that case, we will fetch from third-party.
+  if (rawPrice.isZero()) {
+    const matchingAuToken = networkAddresses.auTokens.find((auToken) => {
+      return isSameAddress(auToken.address, auTokenAddress);
+    });
+    if (matchingAuToken?.name == 'auSTNEAR') {
+      return fetchStNEARPrice();
+    }
+  }
+
   return processPriceFromOracle(rawPrice, underlyingDecimal);
 }
 

package/src/index.ts

@@ -7,8 +7,8 @@ BigNumber.config({ DECIMAL_PLACES: 50 });
 
 export * as abis from './abis';
 export * from './consts';
-export * from './contracts';
 export * from './entities';
 export * from './helpers';
+export * from './interactors';
 export * from './SDK';
 export * from './types';

package/src/{contracts → interactors}/MoneyMarket.ts

@@ -12,7 +12,7 @@ import {
   Token,
   TokenAmount,
 } from '../entities';
-import * as helpers from '../helpers/';
+import * as helpers from '../helpers';
 import { calcValuation, fetchPrice, fetchValuation } from '../helpers/priceFetcher';
 import { Address, ComptrollerRewardType, MoneyMarketDetails, NetworkConnection } from '../types';