Skip to content

Commit ee63e33

Browse files
nikugogoidafaqdhruv
nikugogoi
and
dafaqdhruv
authored
Upgrade Typescript and ESLint (#337) (#342)
* Upgrade eslint and additional lint changes * Upgrade typescript version to v5 --------- Co-authored-by: Dhruv Srivastava <[email protected]>
1 parent 0f239c3 commit ee63e33

File tree

98 files changed

+678
-444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+678
-444
lines changed

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:16.13.1-alpine3.14
1+
FROM node:18.15.0-alpine3.16
22

33
WORKDIR /app
44

‎packages/address-watcher/.eslintrc.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@typescript-eslint"
1717
],
1818
"rules": {
19+
"indent": "off",
1920
"@typescript-eslint/no-explicit-any": "off",
2021
"@typescript-eslint/explicit-module-boundary-types": [
2122
"warn",

‎packages/address-watcher/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
"@typescript-eslint/eslint-plugin": "^5.47.1",
5252
"@typescript-eslint/parser": "^5.47.1",
5353
"chai": "^4.3.4",
54-
"eslint": "^7.27.0",
54+
"eslint": "^8.35.0",
5555
"eslint-config-semistandard": "^15.0.1",
5656
"eslint-config-standard": "^16.0.3",
57-
"eslint-plugin-import": "^2.23.3",
57+
"eslint-plugin-import": "^2.27.5",
5858
"eslint-plugin-node": "^11.1.0",
5959
"eslint-plugin-promise": "^5.1.0",
6060
"eslint-plugin-standard": "^5.0.0",

‎packages/address-watcher/src/database.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import { BlockProgress } from './entity/BlockProgress';
1212
import { Trace } from './entity/Trace';
1313

1414
export class Database {
15-
_config: ConnectionOptions
16-
_conn!: Connection
15+
_config: ConnectionOptions;
16+
_conn!: Connection;
1717

1818
constructor (config: ConnectionOptions) {
1919
assert(config);

‎packages/address-watcher/src/entity/BlockProgress.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ export class BlockProgress {
2020
numTracedTx!: number;
2121

2222
@Column('boolean')
23-
isComplete!: boolean
23+
isComplete!: boolean;
2424
}

‎packages/address-watcher/src/entity/Trace.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ export class Trace {
2323
trace!: string;
2424

2525
@ManyToMany(() => Account, account => account.appearances, { eager: true, cascade: ['insert'] })
26-
accounts: Account[]
26+
accounts: Account[];
2727
}

‎packages/address-watcher/src/indexer.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import { BlockProgress } from './entity/BlockProgress';
1919
const log = debug('vulcanize:indexer');
2020

2121
export class Indexer {
22-
_db: Database
23-
_ethClient: EthClient
24-
_getStorageAt: GetStorageAt
25-
_tracingClient: TracingClient
22+
_db: Database;
23+
_ethClient: EthClient;
24+
_getStorageAt: GetStorageAt;
25+
_tracingClient: TracingClient;
2626

2727
constructor (db: Database, ethClient: EthClient, tracingClient: TracingClient) {
2828
assert(db);

‎packages/address-watcher/src/tx-watcher.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ export const BlockProgressEvent = 'block-progress-event';
1919
export const QUEUE_TX_TRACING = 'tx-tracing';
2020

2121
export class TxWatcher {
22-
_ethClient: EthClient
23-
_indexer: Indexer
24-
_pubsub: PubSub
25-
_watchTxSubscription: ZenObservable.Subscription | undefined
26-
_jobQueue: JobQueue
22+
_ethClient: EthClient;
23+
_indexer: Indexer;
24+
_pubsub: PubSub;
25+
_watchTxSubscription: ZenObservable.Subscription | undefined;
26+
_jobQueue: JobQueue;
2727

2828
constructor (ethClient: EthClient, indexer: Indexer, pubsub: PubSub, jobQueue: JobQueue) {
2929
this._ethClient = ethClient;

‎packages/cache/.eslintrc.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@typescript-eslint"
1717
],
1818
"rules": {
19+
"indent": "off",
1920
"@typescript-eslint/no-explicit-any": "off",
2021
"@typescript-eslint/explicit-module-boundary-types": [
2122
"error",

‎packages/cache/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
"@types/level": "^6.0.0",
3232
"@typescript-eslint/eslint-plugin": "^5.47.1",
3333
"@typescript-eslint/parser": "^5.47.1",
34-
"eslint": "^7.27.0",
34+
"eslint": "^8.35.0",
3535
"eslint-config-semistandard": "^15.0.1",
3636
"eslint-config-standard": "^16.0.3",
37-
"eslint-plugin-import": "^2.23.3",
37+
"eslint-plugin-import": "^2.27.5",
3838
"eslint-plugin-node": "^11.1.0",
3939
"eslint-plugin-promise": "^5.1.0",
4040
"eslint-plugin-standard": "^5.0.0"

‎packages/cli/.eslintrc.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@typescript-eslint"
1717
],
1818
"rules": {
19+
"indent": "off",
1920
"@typescript-eslint/no-explicit-any": "off",
2021
"@typescript-eslint/explicit-module-boundary-types": [
2122
"warn",

‎packages/cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
"@typescript-eslint/parser": "^5.47.1",
3333
"eslint-config-semistandard": "^15.0.1",
3434
"eslint-config-standard": "^5.0.0",
35-
"eslint-plugin-import": "^2.23.3",
35+
"eslint-plugin-import": "^2.27.5",
3636
"eslint-plugin-node": "^11.1.0",
3737
"eslint-plugin-promise": "^5.1.0",
3838
"eslint-plugin-standard": "^5.0.0",
39-
"typescript": "^4.9.4"
39+
"typescript": "^5.0.2"
4040
}
4141
}

‎packages/cli/src/base.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class BaseCmd {
2525
_config?: Config;
2626
_clients?: Clients;
2727
_ethProvider?: JsonRpcProvider;
28-
_jobQueue?: JobQueue
28+
_jobQueue?: JobQueue;
2929
_database?: DatabaseInterface;
3030
_indexer?: IndexerInterface;
3131
_eventWatcher?: EventWatcher;

‎packages/cli/src/checkpoint/create.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ interface Arguments {
2929
}
3030

3131
export class CreateCheckpointCmd {
32-
_argv?: Arguments
33-
_baseCmd: BaseCmd
32+
_argv?: Arguments;
33+
_baseCmd: BaseCmd;
3434

3535
constructor () {
3636
this._baseCmd = new BaseCmd();

‎packages/cli/src/checkpoint/verify.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ interface Arguments {
3030
}
3131

3232
export class VerifyCheckpointCmd {
33-
_argv?: Arguments
34-
_baseCmd: BaseCmd
33+
_argv?: Arguments;
34+
_baseCmd: BaseCmd;
3535

3636
constructor () {
3737
this._baseCmd = new BaseCmd();

‎packages/cli/src/export-state.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ interface Arguments {
3434
}
3535

3636
export class ExportStateCmd {
37-
_argv?: Arguments
37+
_argv?: Arguments;
3838
_baseCmd: BaseCmd;
3939

4040
constructor () {

‎packages/cli/src/fill.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ interface Arguments {
3737
}
3838

3939
export class FillCmd {
40-
_argv?: Arguments
40+
_argv?: Arguments;
4141
_baseCmd: BaseCmd;
4242

4343
constructor () {

‎packages/cli/src/import-state.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ interface Arguments {
3636
}
3737

3838
export class ImportStateCmd {
39-
_argv?: Arguments
39+
_argv?: Arguments;
4040
_baseCmd: BaseCmd;
4141

4242
constructor () {

‎packages/cli/src/inspect-cid.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ interface Arguments {
3131
}
3232

3333
export class InspectCIDCmd {
34-
_argv?: Arguments
34+
_argv?: Arguments;
3535
_baseCmd: BaseCmd;
3636

3737
constructor () {

‎packages/cli/src/job-runner.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ interface Arguments {
2929
}
3030

3131
export class JobRunnerCmd {
32-
_argv?: Arguments
32+
_argv?: Arguments;
3333
_baseCmd: BaseCmd;
3434

3535
constructor () {

‎packages/cli/src/reset/state.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ interface Arguments {
2222
}
2323

2424
export class ResetStateCmd {
25-
_argv?: Arguments
25+
_argv?: Arguments;
2626
_config?: Config;
27-
_database?: DatabaseInterface
27+
_database?: DatabaseInterface;
2828

2929
async initConfig (configFile: string): Promise<Config> {
3030
this._config = await getConfig(configFile);

‎packages/cli/src/reset/watcher.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ interface Arguments {
2828
}
2929

3030
export class ResetWatcherCmd {
31-
_argv?: Arguments
31+
_argv?: Arguments;
3232
_baseCmd: BaseCmd;
3333

3434
constructor () {

‎packages/cli/src/server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ interface Arguments {
4545
}
4646

4747
export class ServerCmd {
48-
_argv?: Arguments
48+
_argv?: Arguments;
4949
_baseCmd: BaseCmd;
5050

5151
constructor () {

‎packages/codegen/.eslintrc.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@typescript-eslint"
1717
],
1818
"rules": {
19+
"indent": "off",
1920
"@typescript-eslint/no-explicit-any": "off",
2021
"@typescript-eslint/explicit-module-boundary-types": [
2122
"warn",

‎packages/codegen/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"node-fetch": "^2",
3535
"solc": "0.8.13",
3636
"ts-node": "^10.2.1",
37-
"typescript": "^4.3.2",
37+
"typescript": "^5.0.2",
3838
"yargs": "^17.1.1"
3939
},
4040
"devDependencies": {
@@ -43,10 +43,10 @@
4343
"@types/node": "^16.9.0",
4444
"@typescript-eslint/eslint-plugin": "^5.47.1",
4545
"@typescript-eslint/parser": "^5.47.1",
46-
"eslint": "^7.27.0",
46+
"eslint": "^8.35.0",
4747
"eslint-config-semistandard": "^15.0.1",
4848
"eslint-config-standard": "^16.0.3",
49-
"eslint-plugin-import": "^2.23.3",
49+
"eslint-plugin-import": "^2.27.5",
5050
"eslint-plugin-node": "^11.1.0",
5151
"eslint-plugin-promise": "^5.1.0"
5252
}

‎packages/codegen/src/templates/package-template.handlebars

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"eslint": "^7.27.0",
6767
"eslint-config-semistandard": "^15.0.1",
6868
"eslint-config-standard": "^16.0.3",
69-
"eslint-plugin-import": "^2.23.3",
69+
"eslint-plugin-import": "^2.27.5",
7070
"eslint-plugin-node": "^11.1.0",
7171
"eslint-plugin-promise": "^5.1.0",
7272
"eslint-plugin-standard": "^5.0.0",

‎packages/eden-watcher/.eslintrc.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@typescript-eslint"
1717
],
1818
"rules": {
19+
"indent": "off",
1920
"@typescript-eslint/no-explicit-any": "off",
2021
"@typescript-eslint/explicit-module-boundary-types": [
2122
"warn",

‎packages/eden-watcher/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@
5959
"@typescript-eslint/eslint-plugin": "^5.47.1",
6060
"@typescript-eslint/parser": "^5.47.1",
6161
"copyfiles": "^2.4.1",
62-
"eslint": "^7.27.0",
62+
"eslint": "^8.35.0",
6363
"eslint-config-semistandard": "^15.0.1",
6464
"eslint-config-standard": "^16.0.3",
65-
"eslint-plugin-import": "^2.23.3",
65+
"eslint-plugin-import": "^2.27.5",
6666
"eslint-plugin-node": "^11.1.0",
6767
"eslint-plugin-promise": "^5.1.0",
6868
"eslint-plugin-standard": "^5.0.0",
6969
"ts-node": "^10.2.1",
70-
"typescript": "^4.3.2"
70+
"typescript": "^5.0.2"
7171
}
7272
}

‎packages/eden-watcher/src/entity/Account.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ export class Account {
2525
totalSlashed!: bigint;
2626

2727
@Column('boolean', { default: false })
28-
isPruned!: boolean
28+
isPruned!: boolean;
2929
}

‎packages/eden-watcher/src/entity/Block.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ export class Block {
6363
size!: bigint;
6464

6565
@Column('boolean', { default: false })
66-
isPruned!: boolean
66+
isPruned!: boolean;
6767
}

‎packages/eden-watcher/src/entity/Claim.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ export class Claim {
3434
claimed!: bigint;
3535

3636
@Column('boolean', { default: false })
37-
isPruned!: boolean
37+
isPruned!: boolean;
3838
}

‎packages/eden-watcher/src/entity/Distribution.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ export class Distribution {
3434
metadataURI!: string;
3535

3636
@Column('boolean', { default: false })
37-
isPruned!: boolean
37+
isPruned!: boolean;
3838
}

‎packages/eden-watcher/src/entity/Distributor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ export class Distributor {
2020
currentDistribution!: string;
2121

2222
@Column('boolean', { default: false })
23-
isPruned!: boolean
23+
isPruned!: boolean;
2424
}

‎packages/eden-watcher/src/entity/Epoch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ export class Epoch {
4141
producerBlocksRatio!: Decimal;
4242

4343
@Column('boolean', { default: false })
44-
isPruned!: boolean
44+
isPruned!: boolean;
4545
}

‎packages/eden-watcher/src/entity/Network.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ export class Network {
4141
stakedPercentiles!: bigint[];
4242

4343
@Column('boolean', { default: false })
44-
isPruned!: boolean
44+
isPruned!: boolean;
4545
}

‎packages/eden-watcher/src/entity/Producer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ export class Producer {
3333
pendingEpochBlocks!: bigint;
3434

3535
@Column('boolean', { default: false })
36-
isPruned!: boolean
36+
isPruned!: boolean;
3737
}

‎packages/eden-watcher/src/entity/ProducerEpoch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ export class ProducerEpoch {
3535
blocksProducedRatio!: Decimal;
3636

3737
@Column('boolean', { default: false })
38-
isPruned!: boolean
38+
isPruned!: boolean;
3939
}

‎packages/eden-watcher/src/entity/ProducerRewardCollectorChange.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ export class ProducerRewardCollectorChange {
2727
rewardCollector!: string;
2828

2929
@Column('boolean', { default: false })
30-
isPruned!: boolean
30+
isPruned!: boolean;
3131
}

‎packages/eden-watcher/src/entity/ProducerSet.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ export class ProducerSet {
2020
producers!: string[];
2121

2222
@Column('boolean', { default: false })
23-
isPruned!: boolean
23+
isPruned!: boolean;
2424
}

‎packages/eden-watcher/src/entity/ProducerSetChange.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ export class ProducerSetChange {
3535
changeType!: ProducerSetChangeType;
3636

3737
@Column('boolean', { default: false })
38-
isPruned!: boolean
38+
isPruned!: boolean;
3939
}

‎packages/eden-watcher/src/entity/RewardSchedule.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ export class RewardSchedule {
2929
activeRewardScheduleEntry!: string;
3030

3131
@Column('boolean', { default: false })
32-
isPruned!: boolean
32+
isPruned!: boolean;
3333
}

‎packages/eden-watcher/src/entity/RewardScheduleEntry.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ export class RewardScheduleEntry {
2727
rewardsPerEpoch!: bigint;
2828

2929
@Column('boolean', { default: false })
30-
isPruned!: boolean
30+
isPruned!: boolean;
3131
}

0 commit comments

Comments
 (0)