Merge pull request #40 from yuichiroaoki/dev

Dev
yuichiroaoki · Feb 4, 2022 · 50088ba · 50088ba
2 parents 97dffa5 + dfb1d89
commit 50088ba
Show file tree

Hide file tree

Showing 14 changed files with 209 additions and 163 deletions.
diff --git a/src/consoleUI/index.ts b/src/consoleUI/index.ts
@@ -0,0 +1,46 @@
+import { Table } from "console-table-printer";
+import { baseTokens, tradingTokens } from "../config";
+const readline = require("readline");
+
+export const initPriceTable = (p: Table, idx: number) => {
+  baseTokens.forEach(async (baseToken) => {
+    tradingTokens.forEach(async (tradingToken) => {
+      if (baseToken.address > tradingToken.address) {
+        p.addRow({
+          index: idx,
+
+          fromToken: (baseToken === tradingToken
+            ? ""
+            : baseToken.symbol
+          ).padEnd(6),
+          toToken: (baseToken === tradingToken
+            ? ""
+            : tradingToken.symbol
+          ).padEnd(6),
+
+          fromAmount: "".padStart(7),
+          toAmount: "".padStart(7),
+
+          difference: "".padStart(7),
+          percentage: "".padStart(5),
+
+          time: "".padStart(6),
+          timestamp: "".padStart(24),
+        });
+
+        idx++;
+      }
+    });
+  });
+};
+
+export const renderTables = (p: Table, pp: Table) => {
+  // console.clear();
+  readline.cursorTo(process.stdout, 0, 0);
+
+  p.printTable();
+
+  if (pp.table.rows.length > 0) {
+    pp.printTable();
+  }
+};
diff --git a/src/consoleUI/table.ts b/src/consoleUI/table.ts
@@ -0,0 +1,59 @@
+import { Table } from "console-table-printer";
+
+export const priceTable = (maxX: number) =>
+  new Table({
+    // title: "Quotes",
+    columns: [
+      { name: "index", title: "#", alignment: "right" },
+
+      { name: "fromToken", title: "From", alignment: "left" },
+      { name: "fromAmount", title: "Amount", alignment: "right" },
+
+      { name: "toToken", title: "To", alignment: "left" },
+      { name: "toAmount", title: "Amount", alignment: "right" },
+
+      { name: "difference", title: "±", alignment: "right" },
+      { name: "percentage", title: "%", alignment: "right" },
+
+      { name: "log", title: "Log", alignment: "left", maxLen: maxX - 101 },
+
+      { name: "time", title: "Time", alignment: "right" },
+      { name: "timestamp", title: "Timestamp", alignment: "right" },
+    ],
+  });
+
+export const flashloanTable = (maxX: number) =>
+  new Table({
+    title: "Flash Loans",
+    columns: [
+      { name: "baseToken", title: "From", alignment: "left" },
+      { name: "tradingToken", title: "To", alignment: "left" },
+
+      { name: "amount", title: "Amount", alignment: "right" },
+
+      { name: "difference", title: "±", alignment: "right" },
+      { name: "percentage", title: "%", alignment: "right" },
+
+      {
+        name: "firstRoutes",
+        title: "First Routes",
+        alignment: "left",
+        maxLen: maxX / 2 - 78,
+      },
+      {
+        name: "secondRoutes",
+        title: "Second Routes",
+        alignment: "left",
+        maxLen: maxX / 2 - 79,
+      },
+
+      {
+        name: "txHash",
+        title: "Transaction Hash",
+        alignment: "left",
+      },
+
+      { name: "time", title: "Time", alignment: "right" },
+      { name: "timestamp", title: "Timestamp", alignment: "right" },
+    ],
+  });
diff --git a/src/constants/addresses.ts b/src/constants/addresses.ts
@@ -118,8 +118,7 @@ export const dodoV2Pool: PoolMap = {
   USDT_DAI: "0xDa43a4aAB20D313Ab3AA07d8E09f3521F32a3D83",
   WETH_USDC: "0x5333Eb1E32522F1893B7C9feA3c263807A02d561",
   WMATIC_USDC: "0x10Dd6d8A29D489BEDE472CC1b22dc695c144c5c7",
-  WMATIC_WETH: "0xC877D7BbCB5b40C3F3d7e7E0d0DA6220BEE027a1",
-  USDC_USDT: "0x56FF5E27d40FBF746ADaa3DA820ADb2056F225E7",
+  USDC_USDT: "0xA0020444b98f67B77a3d6dE6E66aF11c87da086e",
   WBTC_USDC: "0xe020008465cD72301A18b97d33D73bF44858A4b7",
 };
 

diff --git a/src/expect.ts b/src/expect.ts
@@ -1,8 +1,8 @@
 import { BigNumber, ethers } from "ethers";
 import { Hop, IFlashloanRoute, Swap } from "./interfaces/main";
-import { getPriceOnUniV2 } from "./uniswap/v2/getPrice";
-import { getUniswapV3PoolFee } from "./uniswap/v3/fee";
-import { getPriceOnUniV3 } from "./uniswap/v3/getPrice";
+import { getPriceOnUniV2 } from "./price/uniswap/v2/getPrice";
+import { getUniswapV3PoolFee } from "./price/uniswap/v3/fee";
+import { getPriceOnUniV3 } from "./price/uniswap/v3/getPrice";
 import { findRouterFromProtocol, getBigNumber } from "./utils";
 import { splitLoanAmount } from "./utils/split";
 
@@ -52,7 +52,7 @@ const getSwapsAmountOut = async (
   return amountOut;
 };
 
-const expectPriceOnDex = async (
+export const expectPriceOnDex = async (
   protocol: number,
   amountIn: BigNumber,
   tokenIn: string,

diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,6 @@
 import { config as dotEnvConfig } from "dotenv";
 dotEnvConfig();
-import { checkArbitrage } from "./inchPrice";
+import { checkArbitrage } from "./price/1inch";
 import {
   baseTokens,
   interval,
@@ -10,14 +10,12 @@ import {
   diffAmount,
 } from "./config";
 import { createRoutes, flashloan } from "./flashloan";
-import chalk = require("chalk");
 import { expectAmountOut } from "./expect";
 import { getBigNumber } from "./utils";
 import { ethers } from "ethers";
 import { chalkDifference, chalkPercentage, chalkTime } from "./utils/chalk";
-
-const readline = require("readline");
-const { Table } = require("console-table-printer");
+import { flashloanTable, priceTable } from "./consoleUI/table";
+import { initPriceTable, renderTables } from "./consoleUI";
 
 export const main = async () => {
   console.clear();
@@ -26,111 +24,18 @@ export const main = async () => {
 
   const [maxX, _] = process.stdout.getWindowSize();
 
-  const p = new Table({
-    // title: "Quotes",
-    columns: [
-      { name: "index", title: "#", alignment: "right" },
-
-      { name: "fromToken", title: "From", alignment: "left" },
-      { name: "fromAmount", title: "Amount", alignment: "right" },
-
-      { name: "toToken", title: "To", alignment: "left" },
-      { name: "toAmount", title: "Amount", alignment: "right" },
-
-      { name: "difference", title: "±", alignment: "right" },
-      { name: "percentage", title: "%", alignment: "right" },
-
-      { name: "log", title: "Log", alignment: "left", maxLen: maxX - 101 },
-
-      { name: "time", title: "Time", alignment: "right" },
-      { name: "timestamp", title: "Timestamp", alignment: "right" },
-    ],
-  });
-
-  const pp = new Table({
-    title: "Flash Loans",
-    columns: [
-      { name: "baseToken", title: "From", alignment: "left" },
-      { name: "tradingToken", title: "To", alignment: "left" },
-
-      { name: "amount", title: "Amount", alignment: "right" },
-
-      { name: "difference", title: "±", alignment: "right" },
-      { name: "percentage", title: "%", alignment: "right" },
-
-      {
-        name: "firstRoutes",
-        title: "First Routes",
-        alignment: "left",
-        maxLen: maxX / 2 - 78,
-      },
-      {
-        name: "secondRoutes",
-        title: "Second Routes",
-        alignment: "left",
-        maxLen: maxX / 2 - 79,
-      },
-
-      {
-        name: "txHash",
-        title: "Transaction Hash",
-        alignment: "left",
-      },
-
-      { name: "time", title: "Time", alignment: "right" },
-      { name: "timestamp", title: "Timestamp", alignment: "right" },
-    ],
-  });
+  const p = priceTable(maxX);
+  const pp = flashloanTable(maxX);
 
   let idx = 0;
-  baseTokens.forEach(async (baseToken) => {
-    tradingTokens.forEach(async (tradingToken) => {
-      if (baseToken.address > tradingToken.address) {
-        p.addRow({
-          index: idx,
-
-          fromToken: (baseToken === tradingToken
-            ? ""
-            : baseToken.symbol
-          ).padEnd(6),
-          toToken: (baseToken === tradingToken
-            ? ""
-            : tradingToken.symbol
-          ).padEnd(6),
-
-          fromAmount: "".padStart(7),
-          toAmount: "".padStart(7),
-
-          difference: "".padStart(7),
-          percentage: "".padStart(5),
-
-          time: "".padStart(6),
-          timestamp: "".padStart(24),
-        });
-
-        idx++;
-      }
-    });
-  });
+  initPriceTable(p, idx);
 
   idx = 0;
-  const renderTables = () => {
-    // console.clear();
-    readline.cursorTo(process.stdout, 0, 0);
-
-    p.printTable();
-
-    if (pp.table.rows.length > 0) {
-      pp.printTable();
-    }
-  };
-
-  renderTables();
-
+  renderTables(p, pp);
   // const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
 
   setInterval(() => {
-    renderTables();
+    renderTables(p, pp);
   }, renderInterval);
 
   baseTokens.forEach(async (baseToken) => {
@@ -162,7 +67,7 @@ export const main = async () => {
           const [isProfitable, firstProtocols, secondProtocols] =
             await checkArbitrage(baseToken, tradingToken, updateRow);
 
-          renderTables();
+          renderTables(p, pp);
 
           if (isProfitable && !isFlashLoaning) {
             if (firstProtocols && secondProtocols) {
@@ -238,7 +143,7 @@ export const main = async () => {
 
                 isFlashLoaning = false;
 
-                renderTables();
+                renderTables(p, pp);
               }
             }
           }

diff --git a/src/inchPrice.ts → src/price/1inch/index.ts b/src/inchPrice.ts → src/price/1inch/index.ts
@@ -1,44 +1,14 @@
 import { config as dotEnvConfig } from "dotenv";
 dotEnvConfig();
 import { BigNumber, ethers } from "ethers";
-import { chainId, protocols, diffAmount, loanAmount } from "./config";
-import { IRoute } from "./interfaces/main";
-import { ERC20Token, IToken } from "./constants/addresses";
-import { replaceTokenAddress } from "./utils";
-import { IProtocol } from "./interfaces/inch";
-import { sendRequest } from "./utils/request";
-import { chalkDifference, chalkPercentage } from "./utils/chalk";
-
-/**
- * Will get the 1inch API call URL for a trade
- * @param chainId chain id of the network
- * @param fromTokenAddress token address of the token you want to sell
- * @param toTokenAddress token address of the token you want to buy
- * @param amount amount of the token you want to sell
- * @returns call URL for 1inch API
- */
-function get1inchQuoteCallUrl(
-  chainId: number,
-  fromTokenAddress: string,
-  toTokenAddress: string,
-  amount: BigNumber
-): string {
-  const callURL =
-    "https://api.1inch.exchange/v4.0/" +
-    chainId +
-    "/quote?" +
-    "fromTokenAddress=" +
-    fromTokenAddress +
-    "&toTokenAddress=" +
-    toTokenAddress +
-    "&amount=" +
-    amount.toString() +
-    "&mainRouteParts=50" +
-    "&protocols=" +
-    protocols;
-
-  return callURL;
-}
+import { chainId, protocols, diffAmount, loanAmount } from "../../config";
+import { IRoute } from "../../interfaces/main";
+import { ERC20Token, IToken } from "../../constants/addresses";
+import { replaceTokenAddress } from "../../utils";
+import { IProtocol } from "../../interfaces/inch";
+import { sendRequest } from "../../utils/request";
+import { chalkDifference, chalkPercentage } from "../../utils/chalk";
+import { get1inchQuoteCallUrl } from "./url";
 
 /**
  * Will check if there's an arbitrage opportunity using the 1inch API

diff --git a/src/price/1inch/url.ts b/src/price/1inch/url.ts
@@ -0,0 +1,28 @@
+import { BigNumber } from "ethers";
+import { protocols } from "../../config";
+
+/**
+ * Will get the 1inch API call URL for a trade
+ * @param chainId chain id of the network
+ * @param fromTokenAddress token address of the token you want to sell
+ * @param toTokenAddress token address of the token you want to buy
+ * @param amount amount of the token you want to sell
+ * @returns call URL for 1inch API
+ */
+export function get1inchQuoteCallUrl(
+  chainId: number,
+  fromTokenAddress: string,
+  toTokenAddress: string,
+  amount: BigNumber
+): string {
+  const params = {
+    fromTokenAddress: fromTokenAddress,
+    toTokenAddress: toTokenAddress,
+    amount: amount.toString(),
+    protocols: protocols,
+  };
+  const apiURL = "https://api.1inch.exchange/v4.0/";
+  const searchString = new URLSearchParams(params);
+  const callURL = `${apiURL}${chainId}/quote?${searchString}`;
+  return callURL;
+}
diff --git a/src/uniswap/v2/getPrice.ts → src/price/uniswap/v2/getPrice.ts b/src/uniswap/v2/getPrice.ts → src/price/uniswap/v2/getPrice.ts
@@ -1,8 +1,8 @@
 import { config as dotEnvConfig } from "dotenv";
 import { BigNumber, ethers } from "ethers";
 dotEnvConfig();
-import * as UniswapV2Router from "../../abis/IUniswapV2Router02.json";
-import { getBigNumber } from "../../utils";
+import * as UniswapV2Router from "../../../abis/IUniswapV2Router02.json";
+import { getBigNumber } from "../../../utils";
 
 const maticProvider = new ethers.providers.JsonRpcProvider(
   process.env.ALCHEMY_POLYGON_RPC_URL

diff --git a/src/uniswap/v3/fee.ts → src/price/uniswap/v3/fee.ts b/src/uniswap/v3/fee.ts → src/price/uniswap/v3/fee.ts
@@ -1,4 +1,4 @@
-import { findToken } from "../../utils";
+import { findToken } from "../../../utils";
 
 type FeeMap = {
   [pair: string]: {