Release everything to prod (#131)

Merge pull request #131 from madfish-solutions/development

Author: alex-tsx

.env.dist

@@ -10,4 +10,3 @@ THREE_ROUTE_API_AUTH_TOKEN=
 REDIS_URL=
 ADD_NOTIFICATION_USERNAME=
 ADD_NOTIFICATION_PASSWORD=
-TZPRO_API_KEY=

package.json

@@ -15,11 +15,11 @@
     "bignumber.js": "^9.1.0",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
-    "cross-fetch": "^3.1.5",
     "dotenv": "^9.0.2",
     "express": "^4.18.2",
     "firebase-admin": "^10.0.2",
     "ioredis": "^5.3.2",
+    "lodash": "^4.17.21",
     "memoizee": "^0.4.15",
     "pino": "^6.11.2",
     "pino-http": "^5.5.0",

src/config.ts

@@ -12,8 +12,7 @@ export const EnvVars = {
   THREE_ROUTE_API_AUTH_TOKEN: getEnv('THREE_ROUTE_API_AUTH_TOKEN'),
   REDIS_URL: getEnv('REDIS_URL'),
   ADD_NOTIFICATION_USERNAME: getEnv('ADD_NOTIFICATION_USERNAME'),
-  ADD_NOTIFICATION_PASSWORD: getEnv('ADD_NOTIFICATION_PASSWORD'),
-  TZPRO_API_KEY: getEnv('TZPRO_API_KEY')
+  ADD_NOTIFICATION_PASSWORD: getEnv('ADD_NOTIFICATION_PASSWORD')
 };
 
 for (const name in EnvVars) {

src/index.ts

@@ -31,7 +31,7 @@ import logger from './utils/logger';
 import { getSignedMoonPayUrl } from './utils/moonpay/get-signed-moonpay-url';
 import SingleQueryDataProvider from './utils/SingleQueryDataProvider';
 import { tezExchangeRateProvider } from './utils/tezos';
-import { tokensExchangeRatesProvider } from './utils/tokens';
+import { getExchangeRatesFromDB } from './utils/tokens';
 
 const PINO_LOGGER = {
   logger: logger.child({ name: 'web' }),
@@ -150,7 +150,7 @@ app.post('/api/notifications', basicAuth, async (req, res) => {
 
     await redisClient.lpush('notifications', JSON.stringify(newNotification));
 
-    res.status(200).send({ message: 'Notification added successfully' });
+    res.status(200).send({ message: 'Notification added successfully', notification: newNotification });
   } catch (error: any) {
     res.status(500).send({ error: error.message });
   }
@@ -166,28 +166,18 @@ app.get('/api/abtest', (_, res) => {
 app.get('/api/exchange-rates/tez', makeProviderDataRequestHandler(tezExchangeRateProvider));
 
 app.get('/api/exchange-rates', async (_req, res) => {
-  const { data: tokensExchangeRates, error: tokensExchangeRatesError } = await getProviderStateWithTimeout(
-    tokensExchangeRatesProvider
-  );
+  const tokensExchangeRates = await getExchangeRatesFromDB();
   const { data: tezExchangeRate, error: tezExchangeRateError } = await getProviderStateWithTimeout(
     tezExchangeRateProvider
   );
-  if (tokensExchangeRatesError !== undefined) {
-    return res.status(500).send({
-      error: tokensExchangeRatesError.message
-    });
-  } else if (tezExchangeRateError !== undefined) {
+
+  if (tezExchangeRateError !== undefined) {
     return res.status(500).send({
       error: tezExchangeRateError.message
     });
-  } else {
-    if (tokensExchangeRates !== undefined && tezExchangeRate !== undefined) {
-      return res.json([
-        ...tokensExchangeRates.map(({ ...restProps }) => restProps),
-        { exchangeRate: tezExchangeRate.toString() }
-      ]);
-    }
   }
+
+  res.json([...tokensExchangeRates, { exchangeRate: tezExchangeRate.toString() }]);
 });
 
 app.get('/api/moonpay-sign', async (_req, res) => {

src/interfaces/ticker.interface.ts

@@ -27,7 +27,7 @@ export const dappList: DappList[] = [
   },
   {
     name: 'Yupana',
-    dappUrl: 'https://yupana.finance',
+    dappUrl: 'https://app.yupana.finance',
     type: DappType.DeFi,
     logo: 'https://pbs.twimg.com/profile_images/1450382829062393859/NSu06S5C_400x400.png',
     slug: 'yupana',

src/utils/dapp-list-constants.ts

@@ -1,11 +1,12 @@
 import { compose, MichelCodecPacker, Signer, TezosToolkit } from '@taquito/taquito';
 import { tzip12 } from '@taquito/tzip12';
 import { tzip16 } from '@taquito/tzip16';
+import { AxiosError } from 'axios';
 import memoizee from 'memoizee';
 
-import { EnvVars } from '../config';
-import { ITicker } from '../interfaces/ticker.interface';
-import fetch from './fetch';
+import { getMarketsBySymbols } from './coingecko';
+import { isDefined } from './helpers';
+import logger from './logger';
 import SingleQueryDataProvider from './SingleQueryDataProvider';
 import { BcdTokenData } from './tzkt';
 
@@ -54,18 +55,28 @@ export const getStorage = memoizee(
 );
 
 const getTezExchangeRate = async () => {
-  const marketTickers = await fetch<Array<ITicker>>(
-    `https://api.tzpro.io/markets/tickers?api_key=${EnvVars.TZPRO_API_KEY}`
-  );
-  const usdTickers = marketTickers.filter(e => e.quote === 'USD' && e.base === 'XTZ');
-  // price index: use all USD ticker last prices with equal weight
-  const vol = usdTickers.reduce((s, t) => s + t.volume_base, 0) || null;
-  const price = vol === null ? 1 : usdTickers.reduce((s, t) => s + (t.last * t.volume_base) / vol, 0);
-
-  return price;
+  try {
+    const [xtzMarket] = await getMarketsBySymbols(['xtz']);
+
+    return xtzMarket.current_price;
+  } catch (e) {
+    if (!(e instanceof AxiosError)) {
+      logger.error('Request for TEZ exchange rate failed with unknown error');
+    } else if (isDefined(e.response) && isDefined(e.response.data)) {
+      logger.error(
+        `Request for TEZ exchange rate failed with status ${e.response.status} and message ${e.response.data}`
+      );
+    } else if (isDefined(e.response) && isDefined(e.response.status)) {
+      logger.error(`Request for TEZ exchange rate failed with status ${e.response.status}`);
+    } else {
+      logger.error('Request for TEZ exchange rate failed without response');
+    }
+
+    throw e;
+  }
 };
 
-export const tezExchangeRateProvider = new SingleQueryDataProvider(30000, getTezExchangeRate);
+export const tezExchangeRateProvider = new SingleQueryDataProvider(60000, getTezExchangeRate);
 
 export class MetadataParseError extends Error {}
 

src/utils/fetch.ts

@@ -25,7 +25,7 @@ export interface ThreeRouteChain {
 }
 
 // TODO: add axios adapter and change type if precision greater than of standard js number type is necessary
-export interface ThreeRouteSwapResponse {
+export interface ThreeRouteClassicSwapResponse {
   input: number;
   output: number;
   chains: ThreeRouteChain[];
@@ -34,8 +34,8 @@ export interface ThreeRouteSwapResponse {
 export interface ThreeRouteSirsSwapResponse {
   input: number;
   output: number;
-  tzbtcChain: ThreeRouteSwapResponse;
-  xtzChain: ThreeRouteSwapResponse;
+  tzbtcChain: ThreeRouteClassicSwapResponse;
+  xtzChain: ThreeRouteClassicSwapResponse;
 }
 
 interface ThreeRouteTokenCommon {
@@ -98,11 +98,13 @@ export interface ThreeRouteDex {
 
 type ThreeRouteQueryParams = object | SwapQueryParams;
 type ThreeRouteQueryResponse =
-  | ThreeRouteSwapResponse
+  | ThreeRouteClassicSwapResponse
   | ThreeRouteSirsSwapResponse
   | ThreeRouteDex[]
   | ThreeRouteToken[];
 
+export type ThreeRouteSwapResponse = ThreeRouteClassicSwapResponse | ThreeRouteSirsSwapResponse;
+
 export const THREE_ROUTE_SIRS_SYMBOL = 'SIRS';
 
 const threeRouteBuildQueryFn = makeBuildQueryFn<ThreeRouteQueryParams, ThreeRouteQueryResponse>(
@@ -111,18 +113,17 @@ const threeRouteBuildQueryFn = makeBuildQueryFn<ThreeRouteQueryParams, ThreeRout
   { headers: { Authorization: `Basic ${EnvVars.THREE_ROUTE_API_AUTH_TOKEN}` } }
 );
 
-export const getThreeRouteSwap = threeRouteBuildQueryFn<
-  SwapQueryParams,
-  ThreeRouteSwapResponse | ThreeRouteSirsSwapResponse
->(({ inputTokenSymbol, outputTokenSymbol, realAmount }) => {
-  const isSirsSwap = inputTokenSymbol === THREE_ROUTE_SIRS_SYMBOL || outputTokenSymbol === THREE_ROUTE_SIRS_SYMBOL;
+export const getThreeRouteSwap = threeRouteBuildQueryFn<SwapQueryParams, ThreeRouteSwapResponse>(
+  ({ inputTokenSymbol, outputTokenSymbol, realAmount }) => {
+    const isSirsSwap = inputTokenSymbol === THREE_ROUTE_SIRS_SYMBOL || outputTokenSymbol === THREE_ROUTE_SIRS_SYMBOL;
 
-  return `/${isSirsSwap ? 'swap-sirs' : 'swap'}/${inputTokenSymbol}/${outputTokenSymbol}/${realAmount}`;
-});
+    return `/${isSirsSwap ? 'swap-sirs' : 'swap'}/${inputTokenSymbol}/${outputTokenSymbol}/${realAmount}`;
+  }
+);
 
 export const getThreeRouteDexes = threeRouteBuildQueryFn<object, ThreeRouteDex[]>('/dexes', []);
 
 export const getThreeRouteTokens = threeRouteBuildQueryFn<object, ThreeRouteToken[]>('/tokens', []);
 
-export const getChains = (response: ThreeRouteSwapResponse | ThreeRouteSirsSwapResponse) =>
+export const getChains = (response: ThreeRouteSwapResponse) =>
   'chains' in response ? response.chains : [...response.xtzChain.chains, ...response.tzbtcChain.chains];