Merge pull request #15 from initia-labs/bump-ecma

bump ecmascript to es2021
initia-labs · Jan 3, 2024 · 8ac34a8 · 8ac34a8
2 parents 7c383c6 + b77a8a0
commit 8ac34a8
Show file tree

Hide file tree

Showing 14 changed files with 2,902 additions and 15,126 deletions.
diff --git a/bots/package-lock.json b/bots/package-lock.json
diff --git a/bots/package.json b/bots/package.json
@@ -44,39 +44,81 @@
  },
  "homepage": "https://github.com/initia-labs/batch-submitter#readme",
  "devDependencies": {
- "@testcontainers/postgresql": "^10.2.1",
+ "@initia/builder.js": "^0.0.9",
+ "@initia/initia.js": "^0.1.22",
+ "@koa/cors": "^4.0.0",
+ "@sentry/node": "^7.91.0",
+ "@testcontainers/postgresql": "^10.4.0",
+ "@types/bluebird": "^3.5.42",
  "@types/chalk": "^2.2.0",
+ "@types/debug": "^4.1.12",
+ "@types/dockerode": "^3.3.23",
  "@types/jest": "^27.5.2",
  "@types/koa": "^2.13.12",
+ "@types/koa__cors": "^5.0.0",
+ "@types/koa-mount": "^4.0.5",
+ "@types/koa-router": "^7.4.8",
+ "@types/lodash": "^4.14.202",
  "@types/node": "^15.14.9",
- "@typescript-eslint/eslint-plugin": "^6",
- "@typescript-eslint/parser": "^6",
- "concurrently": "^8.2.1",
- "docker-compose": "^0.24.2",
- "eslint": "^8",
+ "@types/pg": "^8.10.9",
+ "@types/ws": "^8.5.10",
+ "@typescript-eslint/eslint-plugin": "^6.17.0",
+ "@typescript-eslint/parser": "^6.17.0",
+ "apidoc": "^1.2.0",
+ "apidoc-core": "^0.15.0",
+ "bignumber.js": "^9.1.2",
+ "bluebird": "^3.7.2",
+ "chalk": "^2.4.2",
+ "concurrently": "^8.2.2",
+ "docker-compose": "^0.24.3",
+ "dockerode": "^3.3.5",
+ "dotenv": "^16.3.1",
+ "eslint": "^8.56.0",
+ "execa": "^8.0.1",
+ "ffi-napi": "^4.0.3",
  "husky": "^8.0.3",
  "jest": "^27.5.1",
- "lint-staged": "^10.5.1",
- "prettier": "^2.1.2",
+ "koa": "^2.15.0",
+ "koa-body": "^5.0.0",
+ "koa-helmet": "^7.0.2",
+ "koa-joi-controllers": "^1.2.3",
+ "koa-morgan": "^1.0.1",
+ "koa-mount": "^4.0.0",
+ "koa-router": "^12.0.1",
+ "koa-static": "^5.0.0",
+ "lint-staged": "^10.5.4",
+ "pako": "^2.1.0",
+ "pg": "^8.11.3",
+ "prettier": "^2.8.8",
+ "reflect-metadata": "^0.1.14",
+ "request": "^2.88.2",
+ "request-promise": "^4.2.6",
+ "sha3": "^2.1.4",
+ "testcontainers": "^10.4.0",
  "ts-jest": "^27.1.5",
- "ts-loader": "^8.0.11",
+ "ts-loader": "^8.4.0",
+ "ts-node": "^10.9.2",
  "tsconfig-paths": "^4.2.0",
  "tsconfig-paths-jest": "^0.0.1",
- "tsconfig-paths-webpack-plugin": "^3.3.0",
- "typescript": "^4.2.4",
- "webpack": "^4",
- "webpack-bundle-analyzer": "^4.1.0"
+ "tsconfig-paths-webpack-plugin": "^3.5.2",
+ "typeorm": "^0.3.17",
+ "typescript": "^4.9.5",
+ "undici": "^5.28.2",
+ "webpack": "^4.47.0",
+ "webpack-bundle-analyzer": "^4.10.1",
+ "winston": "^3.11.0",
+ "winston-daily-rotate-file": "^4.7.1",
+ "zlib": "^1.0.5"
  },
  "dependencies": {
  "@initia/builder.js": "^0.0.9",
  "@initia/initia.js": "^0.1.22",
  "@koa/cors": "^4.0.0",
- "@sentry/node": "^7.60.0",
- "@types/bluebird": "^3.5.38",
- "@types/dockerode": "^3.3.19",
- "@types/pg": "^8.10.2",
- "@types/ws": "^8.5.5",
- "apidoc": "^1.1.0",
+ "@sentry/node": "^7.91.0",
+ "@types/dockerode": "^3.3.23",
+ "@types/pg": "^8.10.9",
+ "@types/ws": "^8.5.10",
+ "apidoc": "^1.2.0",
  "apidoc-core": "^0.15.0",
  "bignumber.js": "^9.1.2",
  "bluebird": "^3.7.2",
@@ -85,27 +127,32 @@
  "dotenv": "^16.3.1",
  "execa": "^8.0.1",
  "ffi-napi": "^4.0.3",
- "koa": "^2.14.2",
+ "koa": "^2.15.0",
  "koa-body": "^5.0.0",
  "koa-helmet": "^7.0.2",
  "koa-joi-controllers": "^1.2.3",
  "koa-morgan": "^1.0.1",
  "koa-mount": "^4.0.0",
- "koa-router": "^12.0.0",
+ "koa-router": "^12.0.1",
  "koa-static": "^5.0.0",
  "merkletreejs": "0.2.16",
  "pako": "^2.1.0",
  "pg": "^8.11.3",
- "reflect-metadata": "^0.1.13",
+ "reflect-metadata": "^0.1.14",
  "request": "^2.88.2",
  "request-promise": "^4.2.6",
  "sha3": "^2.1.4",
- "testcontainers": "^10.2.1",
- "ts-node": "^10.9.1",
+ "testcontainers": "^10.4.0",
+ "ts-node": "^10.9.2",
  "typeorm": "^0.3.17",
- "undici": "^5.22.1",
- "winston": "^3.10.0",
+ "undici": "^5.28.2",
+ "winston": "^3.11.0",
  "winston-daily-rotate-file": "^4.7.1",
  "zlib": "^1.0.5"
+ },
+ "overrides": {
+ "koa-joi-controllers": {
+ "is-gen-fn": "0.0.2"
+ }
  }
 }
diff --git a/bots/src/lib/logger.ts b/bots/src/lib/logger.ts
@@ -1,5 +1,5 @@
 import * as winston from 'winston';
-import * as DailyRotateFile from 'winston-daily-rotate-file';
+import DailyRotateFile from 'winston-daily-rotate-file';
 import { config } from 'config';
 
 function createLogger(name: string) {

diff --git a/bots/src/lib/rpc.ts b/bots/src/lib/rpc.ts
@@ -1,6 +1,6 @@
 import * as winston from 'winston';
 import axios, { AxiosRequestConfig } from 'axios';
-import * as Websocket from 'ws';
+import Websocket from 'ws';
 
 export class RPCSocket {
  public ws: Websocket;

diff --git a/bots/src/loader/apidoc.ts b/bots/src/loader/apidoc.ts
@@ -1,5 +1,5 @@
-import * as Koa from 'koa';
-import * as serve from 'koa-static';
+import Koa from 'koa';
+import serve from 'koa-static';
 import * as path from 'path';
 
 const notFoundMiddleware: Koa.Middleware = (ctx) => {

diff --git a/bots/src/loader/app.ts b/bots/src/loader/app.ts
@@ -1,13 +1,13 @@
 // import { controllers } from 'controller'
-import * as Koa from 'koa';
-import * as bodyParser from 'koa-body';
-import * as Router from 'koa-router';
-import * as cors from '@koa/cors';
+import Koa from 'koa';
+import bodyParser from 'koa-body';
+import Router from 'koa-router';
+import cors from '@koa/cors';
 import { errorHandler, APIError, ErrorTypes } from 'lib/error';
 import { error } from 'lib/response';
 import { KoaController, configureRoutes } from 'koa-joi-controllers';
 import { createApiDocApp } from './apidoc';
-import * as mount from 'koa-mount';
+import mount from 'koa-mount';
 
 const notFoundMiddleware: Koa.Middleware = (ctx) => {
  ctx.status = 404;

diff --git a/bots/src/orm/CamelToSnakeNamingStrategy.js → bots/src/orm/CamelToSnakeNamingStrategy.ts b/bots/src/orm/CamelToSnakeNamingStrategy.js → bots/src/orm/CamelToSnakeNamingStrategy.ts
@@ -1,8 +1,7 @@
-/* eslint-disable no-undef */
-const { DefaultNamingStrategy } = require('typeorm');
-const { snakeCase } = require('lodash');
+import { DefaultNamingStrategy, NamingStrategyInterface } from 'typeorm';
+import { snakeCase } from 'lodash';
 
-class CamelToSnakeNamingStrategy extends DefaultNamingStrategy {
+class CamelToSnakeNamingStrategy extends DefaultNamingStrategy implements NamingStrategyInterface {
  tableName(targetName, userSpecifiedName) {
  return userSpecifiedName ? userSpecifiedName : snakeCase(targetName);
  }
@@ -17,4 +16,4 @@ class CamelToSnakeNamingStrategy extends DefaultNamingStrategy {
  }
 }
 
-module.exports = CamelToSnakeNamingStrategy;
+export default CamelToSnakeNamingStrategy;
diff --git a/bots/src/worker/batchSubmitter/db.ts b/bots/src/worker/batchSubmitter/db.ts
@@ -1,12 +1,12 @@
 import 'reflect-metadata';
-import * as Bluebird from 'bluebird';
+import Bluebird from 'bluebird';
 import {
  ConnectionOptionsReader,
  DataSource,
  DataSourceOptions
 } from 'typeorm';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-import * as CamelToSnakeNamingStrategy from 'orm/CamelToSnakeNamingStrategy';
+import CamelToSnakeNamingStrategy from 'orm/CamelToSnakeNamingStrategy';
 
 const debug = require('debug')('orm');
 
@@ -31,7 +31,7 @@ function initConnection(options: DataSourceOptions): Promise<DataSource> {
  return new DataSource({
  ...options,
  ...staticOptions,
- namingStrategy: new CamelToSnakeNamingStrategy() as any
+ namingStrategy: new CamelToSnakeNamingStrategy()
  }).initialize();
 }
 

diff --git a/bots/src/worker/bridgeExecutor/Monitor.ts b/bots/src/worker/bridgeExecutor/Monitor.ts
@@ -1,4 +1,4 @@
-import * as Bluebird from 'bluebird';
+import Bluebird from 'bluebird';
 import { RPCClient, RPCSocket } from 'lib/rpc';
 import { StateEntity } from 'orm';
 import { DataSource, EntityManager } from 'typeorm';

diff --git a/bots/src/worker/bridgeExecutor/Resurrector.ts b/bots/src/worker/bridgeExecutor/Resurrector.ts
@@ -3,7 +3,7 @@ import FailedTxEntity from 'orm/executor/FailedTxEntity';
 import { Coin, MsgFinalizeTokenDeposit } from '@initia/initia.js';
 import { INTERVAL_MONITOR, config } from 'config';
 import { DataSource } from 'typeorm';
-import * as Bluebird from 'bluebird';
+import Bluebird from 'bluebird';
 import winston from 'winston';
 import { TxWallet, WalletType, getWallet, initWallet } from 'lib/wallet';
 import { buildFailedTxNotification, notifySlack } from 'lib/slack';

diff --git a/bots/src/worker/bridgeExecutor/db.ts b/bots/src/worker/bridgeExecutor/db.ts
@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import * as Bluebird from 'bluebird';
+import Bluebird from 'bluebird';
 import {
  ConnectionOptionsReader,
  DataSource,
@@ -10,7 +10,7 @@ import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConne
 import debugModule from 'debug';
 const debug = debugModule('orm');
 
-import * as CamelToSnakeNamingStrategy from 'orm/CamelToSnakeNamingStrategy';
+import CamelToSnakeNamingStrategy from 'orm/CamelToSnakeNamingStrategy';
 
 import {
  ExecutorOutputEntity,
@@ -45,7 +45,7 @@ function initConnection(options: DataSourceOptions): Promise<DataSource> {
  return new DataSource({
  ...options,
  ...staticOptions,
- namingStrategy: new CamelToSnakeNamingStrategy() as any
+ namingStrategy: new CamelToSnakeNamingStrategy()
  }).initialize();
 }
 

diff --git a/bots/src/worker/challenger/db.ts b/bots/src/worker/challenger/db.ts
@@ -1,12 +1,12 @@
 import 'reflect-metadata';
-import * as Bluebird from 'bluebird';
+import Bluebird from 'bluebird';
 import {
  ConnectionOptionsReader,
  DataSource,
  DataSourceOptions
 } from 'typeorm';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-import * as CamelToSnakeNamingStrategy from 'orm/CamelToSnakeNamingStrategy';
+import CamelToSnakeNamingStrategy from 'orm/CamelToSnakeNamingStrategy';
 
 const debug = require('debug')('orm');
 

diff --git a/bots/src/worker/outputSubmitter/db.ts b/bots/src/worker/outputSubmitter/db.ts
@@ -1,12 +1,12 @@
 import 'reflect-metadata';
-import * as Bluebird from 'bluebird';
+import Bluebird from 'bluebird';
 import {
  ConnectionOptionsReader,
  DataSource,
  DataSourceOptions
 } from 'typeorm';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-import * as CamelToSnakeNamingStrategy from 'orm/CamelToSnakeNamingStrategy';
+import CamelToSnakeNamingStrategy from 'orm/CamelToSnakeNamingStrategy';
 
 const debug = require('debug')('orm');
 
@@ -31,7 +31,7 @@ function initConnection(options: DataSourceOptions): Promise<DataSource> {
  return new DataSource({
  ...options,
  ...staticOptions,
- namingStrategy: new CamelToSnakeNamingStrategy() as any
+ namingStrategy: new CamelToSnakeNamingStrategy()
  }).initialize();
 }
 

diff --git a/bots/tsconfig.json b/bots/tsconfig.json
@@ -1,12 +1,13 @@
 {
  "compilerOptions": {
- "target": "es2019",
- "module": "commonjs",
+ "allowSyntheticDefaultImports": true,
+ "esModuleInterop": true,
+ "target": "es2021",
+ "module": "node16",
  "allowJs": false,
  "emitDecoratorMetadata": true,
  "experimentalDecorators": true,
- "allowSyntheticDefaultImports": true,
- "moduleResolution": "node",
+ "moduleResolution": "node16",
  "skipLibCheck": true,
  "strictNullChecks": true,
  "sourceMap": true,
@@ -17,9 +18,9 @@
  "paths": {
  "graphql": ["node_modules/graphql"],
  "orm/*": ["orm/*"],
- "*": ["*"],
+ "*": ["*"]
  }
  },
  "include": ["src/**/*.ts", "test", "lib", "test/**/*.ts", "src/worker/bridgeExecutor/db.ts"],
- "exclude": ["node_modules", "apidoc", "dist"]
+ "exclude": ["node_modules", "apidoc", "dist", "./src/**/*.spec.ts"]
 }