refactor: Move fee estimation to core (#82)

sidestream-tech · Feb 3, 2022 · bb2c0a4 · bb2c0a4
1 parent 69f4d1a
commit bb2c0a4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 66 deletions.
diff --git a/core/src/auctions.ts b/core/src/auctions.ts
@@ -1,4 +1,4 @@
-import type { Auction, AuctionInitialInfo, Notifier } from './types';
+import type { Auction, AuctionInitialInfo, AuctionTransaction, Notifier } from './types';
 import BigNumber from './bignumber';
 import fetchAuctionsByCollateralType, { fetchAuctionStatus } from './fetch';
 import { getExchangeRateBySymbol, getUniswapCalleeBySymbol, getUniswapParametersByCollateral } from './uniswap';
@@ -14,6 +14,7 @@ import {
 import { getSupportedCollateralTypes } from './addresses';
 import { getClipperNameByCollateralType } from './contracts';
 import convertNumberTo32Bytes from './helpers/convertNumberTo32Bytes';
+import { enrichAuctionWithTransactionFees, getApproximateTransactionFees } from './fees';
 
 const enrichAuctionWithActualNumbers = async function (
     network: string,
@@ -107,7 +108,7 @@ export const fetchAllInitialAuctions = async function (network: string): Promise
     return auctionGroups.flat();
 };
 
-export const fetchAllAuctions = async function (network: string): Promise<Auction[]> {
+export const fetchAllAuctions = async function (network: string): Promise<AuctionTransaction[]> {
     const auctions = await fetchAllInitialAuctions(network);
 
     // enrich them with statuses
@@ -120,7 +121,13 @@ export const fetchAllAuctions = async function (network: string): Promise<Auctio
     const auctionsWithPriceDrop = await Promise.all(auctionsWithStatuses.map(enrichAuctionWithPriceDrop));
 
     // enrich them with market values
-    return await Promise.all(auctionsWithPriceDrop.map(a => enrichAuctionWithMarketValues(a, network)));
+    const auctionsWithMarketValue = await Promise.all(
+        auctionsWithPriceDrop.map(a => enrichAuctionWithMarketValues(a, network))
+    );
+
+    // enrich with profit and fee calculation
+    const fees = await getApproximateTransactionFees(network);
+    return await Promise.all(auctionsWithMarketValue.map(a => enrichAuctionWithTransactionFees(a, fees)));
 };
 
 export const restartAuction = async function (

diff --git a/core/src/gas.ts b/core/src/gas.ts
@@ -2,16 +2,24 @@ import { ethers } from 'ethers';
 import BigNumber from './bignumber';
 import { getNetworkConfigByType } from './constants/NETWORKS';
 import { ETH_NUMBER_OF_DIGITS } from './constants/UNITS';
+import memoizee from 'memoizee';
 
 const API_URL = 'https://ethgasstation.info/json/ethgasAPI.json';
 const TRANSACTION_SPEED = 'fast';
 
-const getCurrentGasPrice = async function (): Promise<BigNumber> {
+const GAS_CACHE = 10 * 1000;
+
+const _getCurrentGasPrice = async function (): Promise<BigNumber> {
     const gasData = await fetch(API_URL).then(r => r.json());
     const gasPriceString = ethers.utils.formatUnits(gasData[TRANSACTION_SPEED] / 10, 'gwei');
     return new BigNumber(gasPriceString);
 };
 
+const getCurrentGasPrice = memoizee(_getCurrentGasPrice, {
+    maxAge: GAS_CACHE,
+    promise: true,
+});
+
 export const getGasPrice = async function (network: string): Promise<BigNumber> {
     const networkConfig = getNetworkConfigByType(network);
     if (networkConfig.gasPrice) {

diff --git a/frontend/store/auctions.ts b/frontend/store/auctions.ts
@@ -1,4 +1,4 @@
-import type { Auction, AuctionTransaction, TransactionFees } from 'auctions-core/src/types';
+import type { Auction, AuctionTransaction } from 'auctions-core/src/types';
 import { ActionContext } from 'vuex';
 import { message } from 'ant-design-vue';
 import {
@@ -8,7 +8,6 @@ import {
     enrichAuctionWithPriceDropAndMarketValue,
 } from 'auctions-core/src/auctions';
 import { checkAllExchangeRates } from 'auctions-core/src/uniswap';
-import { enrichAuctionWithTransactionFees } from 'auctions-core/src/fees';
 import { checkAllCalcParameters } from 'auctions-core/src/params';
 import { checkAllSupportedCollaterals } from 'auctions-core/src/addresses';
 import getWallet from '~/lib/wallet';
@@ -21,7 +20,7 @@ let refetchIntervalId: ReturnType<typeof setInterval> | undefined;
 let updateAuctionsPricesIntervalId: ReturnType<typeof setInterval> | undefined;
 
 interface State {
-    auctionStorage: Record<string, Auction>;
+    auctionStorage: Record<string, AuctionTransaction>;
     isFetching: boolean;
     isBidding: boolean;
     error: string | null;
@@ -40,11 +39,8 @@ export const getters = {
     listAuctions(state: State) {
         return Object.values(state.auctionStorage);
     },
-    listAuctionTransactions(state: State, getters: any, _rootState: any, rootGetters: any): AuctionTransaction[] {
-        const fees: TransactionFees = rootGetters['fees/fees'];
-        const auctions = Object.values(state.auctionStorage).map(auction =>
-            enrichAuctionWithTransactionFees(auction, fees)
-        );
+    listAuctionTransactions(state: State, getters: any, _rootState: any): AuctionTransaction[] {
+        const auctions = Object.values(state.auctionStorage);
         auctions.forEach(auction => {
             auction.isRestarting = getters.isAuctionRestarting(auction.id);
         });
@@ -68,11 +64,14 @@ export const getters = {
 };
 
 export const mutations = {
-    setAuctions(state: State, auctions: Auction[]) {
-        const newAuctionStorage = auctions.reduce((auctionStorage: Record<string, Auction>, auction: Auction) => {
-            auctionStorage[auction.id] = auction;
-            return auctionStorage;
-        }, {});
+    setAuctions(state: State, auctions: AuctionTransaction[]) {
+        const newAuctionStorage = auctions.reduce(
+            (auctionStorage: Record<string, AuctionTransaction>, auction: AuctionTransaction) => {
+                auctionStorage[auction.id] = auction;
+                return auctionStorage;
+            },
+            {}
+        );
         const finishedAuctionIds = Object.keys(state.auctionStorage).filter(auctionID => {
             return !newAuctionStorage[auctionID];
         });
@@ -85,7 +84,7 @@ export const mutations = {
             ...newAuctionStorage,
         };
     },
-    setAuction(state: State, auction: Auction) {
+    setAuction(state: State, auction: AuctionTransaction) {
         state.auctionStorage[auction.id] = auction;
     },
     setAuctionFinish(state: State, { id, transactionAddress }: { id: string; transactionAddress: string }) {

diff --git a/frontend/store/fees.ts b/frontend/store/fees.ts