Upgrade Typescript and ESLint (#337) (#342)

* Upgrade eslint and additional lint changes * Upgrade typescript version to v5 --------- Co-authored-by: Dhruv Srivastava <[email protected]>
cerc-io · Mar 24, 2023 · ee63e33 · ee63e33
1 parent 0f239c3
commit ee63e33
Show file tree

Hide file tree

Showing 98 changed files with 678 additions and 444 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.13.1-alpine3.14
+FROM node:18.15.0-alpine3.16
 
 WORKDIR /app
 

diff --git a/packages/address-watcher/.eslintrc.json b/packages/address-watcher/.eslintrc.json
@@ -16,6 +16,7 @@
         "@typescript-eslint"
     ],
     "rules": {
+        "indent": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": [
             "warn",

diff --git a/packages/address-watcher/package.json b/packages/address-watcher/package.json
@@ -51,10 +51,10 @@
     "@typescript-eslint/eslint-plugin": "^5.47.1",
     "@typescript-eslint/parser": "^5.47.1",
     "chai": "^4.3.4",
-    "eslint": "^7.27.0",
+    "eslint": "^8.35.0",
     "eslint-config-semistandard": "^15.0.1",
     "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.3",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",

diff --git a/packages/address-watcher/src/database.ts b/packages/address-watcher/src/database.ts
@@ -12,8 +12,8 @@ import { BlockProgress } from './entity/BlockProgress';
 import { Trace } from './entity/Trace';
 
 export class Database {
-  _config: ConnectionOptions
-  _conn!: Connection
+  _config: ConnectionOptions;
+  _conn!: Connection;
 
   constructor (config: ConnectionOptions) {
     assert(config);

diff --git a/packages/address-watcher/src/entity/BlockProgress.ts b/packages/address-watcher/src/entity/BlockProgress.ts
@@ -20,5 +20,5 @@ export class BlockProgress {
   numTracedTx!: number;
 
   @Column('boolean')
-  isComplete!: boolean
+  isComplete!: boolean;
 }
diff --git a/packages/address-watcher/src/entity/Trace.ts b/packages/address-watcher/src/entity/Trace.ts
@@ -23,5 +23,5 @@ export class Trace {
   trace!: string;
 
   @ManyToMany(() => Account, account => account.appearances, { eager: true, cascade: ['insert'] })
-  accounts: Account[]
+  accounts: Account[];
 }
diff --git a/packages/address-watcher/src/indexer.ts b/packages/address-watcher/src/indexer.ts
@@ -19,10 +19,10 @@ import { BlockProgress } from './entity/BlockProgress';
 const log = debug('vulcanize:indexer');
 
 export class Indexer {
-  _db: Database
-  _ethClient: EthClient
-  _getStorageAt: GetStorageAt
-  _tracingClient: TracingClient
+  _db: Database;
+  _ethClient: EthClient;
+  _getStorageAt: GetStorageAt;
+  _tracingClient: TracingClient;
 
   constructor (db: Database, ethClient: EthClient, tracingClient: TracingClient) {
     assert(db);

diff --git a/packages/address-watcher/src/tx-watcher.ts b/packages/address-watcher/src/tx-watcher.ts
@@ -19,11 +19,11 @@ export const BlockProgressEvent = 'block-progress-event';
 export const QUEUE_TX_TRACING = 'tx-tracing';
 
 export class TxWatcher {
-  _ethClient: EthClient
-  _indexer: Indexer
-  _pubsub: PubSub
-  _watchTxSubscription: ZenObservable.Subscription | undefined
-  _jobQueue: JobQueue
+  _ethClient: EthClient;
+  _indexer: Indexer;
+  _pubsub: PubSub;
+  _watchTxSubscription: ZenObservable.Subscription | undefined;
+  _jobQueue: JobQueue;
 
   constructor (ethClient: EthClient, indexer: Indexer, pubsub: PubSub, jobQueue: JobQueue) {
     this._ethClient = ethClient;

diff --git a/packages/cache/.eslintrc.json b/packages/cache/.eslintrc.json
@@ -16,6 +16,7 @@
         "@typescript-eslint"
     ],
     "rules": {
+        "indent": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": [
             "error",

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -31,10 +31,10 @@
     "@types/level": "^6.0.0",
     "@typescript-eslint/eslint-plugin": "^5.47.1",
     "@typescript-eslint/parser": "^5.47.1",
-    "eslint": "^7.27.0",
+    "eslint": "^8.35.0",
     "eslint-config-semistandard": "^15.0.1",
     "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.3",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0"

diff --git a/packages/cli/.eslintrc.json b/packages/cli/.eslintrc.json
@@ -16,6 +16,7 @@
         "@typescript-eslint"
     ],
     "rules": {
+        "indent": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": [
             "warn",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -32,10 +32,10 @@
     "@typescript-eslint/parser": "^5.47.1",
     "eslint-config-semistandard": "^15.0.1",
     "eslint-config-standard": "^5.0.0",
-    "eslint-plugin-import": "^2.23.3",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",
-    "typescript": "^4.9.4"
+    "typescript": "^5.0.2"
   }
 }
diff --git a/packages/cli/src/base.ts b/packages/cli/src/base.ts
@@ -25,7 +25,7 @@ export class BaseCmd {
   _config?: Config;
   _clients?: Clients;
   _ethProvider?: JsonRpcProvider;
-  _jobQueue?: JobQueue
+  _jobQueue?: JobQueue;
   _database?: DatabaseInterface;
   _indexer?: IndexerInterface;
   _eventWatcher?: EventWatcher;

diff --git a/packages/cli/src/checkpoint/create.ts b/packages/cli/src/checkpoint/create.ts
@@ -29,8 +29,8 @@ interface Arguments {
 }
 
 export class CreateCheckpointCmd {
-  _argv?: Arguments
-  _baseCmd: BaseCmd
+  _argv?: Arguments;
+  _baseCmd: BaseCmd;
 
   constructor () {
     this._baseCmd = new BaseCmd();

diff --git a/packages/cli/src/checkpoint/verify.ts b/packages/cli/src/checkpoint/verify.ts
@@ -30,8 +30,8 @@ interface Arguments {
 }
 
 export class VerifyCheckpointCmd {
-  _argv?: Arguments
-  _baseCmd: BaseCmd
+  _argv?: Arguments;
+  _baseCmd: BaseCmd;
 
   constructor () {
     this._baseCmd = new BaseCmd();

diff --git a/packages/cli/src/export-state.ts b/packages/cli/src/export-state.ts
@@ -34,7 +34,7 @@ interface Arguments {
 }
 
 export class ExportStateCmd {
-  _argv?: Arguments
+  _argv?: Arguments;
   _baseCmd: BaseCmd;
 
   constructor () {

diff --git a/packages/cli/src/fill.ts b/packages/cli/src/fill.ts
@@ -37,7 +37,7 @@ interface Arguments {
 }
 
 export class FillCmd {
-  _argv?: Arguments
+  _argv?: Arguments;
   _baseCmd: BaseCmd;
 
   constructor () {

diff --git a/packages/cli/src/import-state.ts b/packages/cli/src/import-state.ts
@@ -36,7 +36,7 @@ interface Arguments {
 }
 
 export class ImportStateCmd {
-  _argv?: Arguments
+  _argv?: Arguments;
   _baseCmd: BaseCmd;
 
   constructor () {

diff --git a/packages/cli/src/inspect-cid.ts b/packages/cli/src/inspect-cid.ts
@@ -31,7 +31,7 @@ interface Arguments {
 }
 
 export class InspectCIDCmd {
-  _argv?: Arguments
+  _argv?: Arguments;
   _baseCmd: BaseCmd;
 
   constructor () {

diff --git a/packages/cli/src/job-runner.ts b/packages/cli/src/job-runner.ts
@@ -29,7 +29,7 @@ interface Arguments {
 }
 
 export class JobRunnerCmd {
-  _argv?: Arguments
+  _argv?: Arguments;
   _baseCmd: BaseCmd;
 
   constructor () {

diff --git a/packages/cli/src/reset/state.ts b/packages/cli/src/reset/state.ts
@@ -22,9 +22,9 @@ interface Arguments {
 }
 
 export class ResetStateCmd {
-  _argv?: Arguments
+  _argv?: Arguments;
   _config?: Config;
-  _database?: DatabaseInterface
+  _database?: DatabaseInterface;
 
   async initConfig (configFile: string): Promise<Config> {
     this._config = await getConfig(configFile);

diff --git a/packages/cli/src/reset/watcher.ts b/packages/cli/src/reset/watcher.ts
@@ -28,7 +28,7 @@ interface Arguments {
 }
 
 export class ResetWatcherCmd {
-  _argv?: Arguments
+  _argv?: Arguments;
   _baseCmd: BaseCmd;
 
   constructor () {

diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
@@ -45,7 +45,7 @@ interface Arguments {
 }
 
 export class ServerCmd {
-  _argv?: Arguments
+  _argv?: Arguments;
   _baseCmd: BaseCmd;
 
   constructor () {

diff --git a/packages/codegen/.eslintrc.json b/packages/codegen/.eslintrc.json
@@ -16,6 +16,7 @@
         "@typescript-eslint"
     ],
     "rules": {
+        "indent": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": [
             "warn",

diff --git a/packages/codegen/package.json b/packages/codegen/package.json
@@ -34,7 +34,7 @@
     "node-fetch": "^2",
     "solc": "0.8.13",
     "ts-node": "^10.2.1",
-    "typescript": "^4.3.2",
+    "typescript": "^5.0.2",
     "yargs": "^17.1.1"
   },
   "devDependencies": {
@@ -43,10 +43,10 @@
     "@types/node": "^16.9.0",
     "@typescript-eslint/eslint-plugin": "^5.47.1",
     "@typescript-eslint/parser": "^5.47.1",
-    "eslint": "^7.27.0",
+    "eslint": "^8.35.0",
     "eslint-config-semistandard": "^15.0.1",
     "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.3",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0"
   }

diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars
@@ -66,7 +66,7 @@
     "eslint": "^7.27.0",
     "eslint-config-semistandard": "^15.0.1",
     "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.3",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",

diff --git a/packages/eden-watcher/.eslintrc.json b/packages/eden-watcher/.eslintrc.json
@@ -16,6 +16,7 @@
         "@typescript-eslint"
     ],
     "rules": {
+        "indent": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/explicit-module-boundary-types": [
             "warn",

diff --git a/packages/eden-watcher/package.json b/packages/eden-watcher/package.json
@@ -59,14 +59,14 @@
     "@typescript-eslint/eslint-plugin": "^5.47.1",
     "@typescript-eslint/parser": "^5.47.1",
     "copyfiles": "^2.4.1",
-    "eslint": "^7.27.0",
+    "eslint": "^8.35.0",
     "eslint-config-semistandard": "^15.0.1",
     "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.3",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",
     "ts-node": "^10.2.1",
-    "typescript": "^4.3.2"
+    "typescript": "^5.0.2"
   }
 }
diff --git a/packages/eden-watcher/src/entity/Account.ts b/packages/eden-watcher/src/entity/Account.ts
@@ -25,5 +25,5 @@ export class Account {
   totalSlashed!: bigint;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/Block.ts b/packages/eden-watcher/src/entity/Block.ts
@@ -63,5 +63,5 @@ export class Block {
   size!: bigint;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/Claim.ts b/packages/eden-watcher/src/entity/Claim.ts
@@ -34,5 +34,5 @@ export class Claim {
   claimed!: bigint;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/Distribution.ts b/packages/eden-watcher/src/entity/Distribution.ts
@@ -34,5 +34,5 @@ export class Distribution {
   metadataURI!: string;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/Distributor.ts b/packages/eden-watcher/src/entity/Distributor.ts
@@ -20,5 +20,5 @@ export class Distributor {
   currentDistribution!: string;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/Epoch.ts b/packages/eden-watcher/src/entity/Epoch.ts
@@ -41,5 +41,5 @@ export class Epoch {
   producerBlocksRatio!: Decimal;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/Network.ts b/packages/eden-watcher/src/entity/Network.ts
@@ -41,5 +41,5 @@ export class Network {
   stakedPercentiles!: bigint[];
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/Producer.ts b/packages/eden-watcher/src/entity/Producer.ts
@@ -33,5 +33,5 @@ export class Producer {
   pendingEpochBlocks!: bigint;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/ProducerEpoch.ts b/packages/eden-watcher/src/entity/ProducerEpoch.ts
@@ -35,5 +35,5 @@ export class ProducerEpoch {
   blocksProducedRatio!: Decimal;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/ProducerRewardCollectorChange.ts b/packages/eden-watcher/src/entity/ProducerRewardCollectorChange.ts
@@ -27,5 +27,5 @@ export class ProducerRewardCollectorChange {
   rewardCollector!: string;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/ProducerSet.ts b/packages/eden-watcher/src/entity/ProducerSet.ts
@@ -20,5 +20,5 @@ export class ProducerSet {
   producers!: string[];
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/ProducerSetChange.ts b/packages/eden-watcher/src/entity/ProducerSetChange.ts
@@ -35,5 +35,5 @@ export class ProducerSetChange {
   changeType!: ProducerSetChangeType;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/RewardSchedule.ts b/packages/eden-watcher/src/entity/RewardSchedule.ts
@@ -29,5 +29,5 @@ export class RewardSchedule {
   activeRewardScheduleEntry!: string;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }
diff --git a/packages/eden-watcher/src/entity/RewardScheduleEntry.ts b/packages/eden-watcher/src/entity/RewardScheduleEntry.ts
@@ -27,5 +27,5 @@ export class RewardScheduleEntry {
   rewardsPerEpoch!: bigint;
 
   @Column('boolean', { default: false })
-  isPruned!: boolean
+  isPruned!: boolean;
 }