From ca1ad94740736d1544ba155dde47d2fadcf43e8c Mon Sep 17 00:00:00 2001 From: yoozo Date: Mon, 21 Oct 2024 05:45:31 +0000 Subject: [PATCH 1/9] Update @subql deps --- packages/node/package.json | 2 +- packages/types/package.json | 2 +- yarn.lock | 41 +++++++++++++++---------------------- 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/packages/node/package.json b/packages/node/package.json index 7a0a252e08..c170c33164 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -26,7 +26,7 @@ "@nestjs/schedule": "^3.0.1", "@subql/common": "^5.1.3", "@subql/common-ethereum": "workspace:*", - "@subql/node-core": "^14.1.2", + "@subql/node-core": "^14.1.6", "@subql/testing": "^2.2.1", "@subql/types-ethereum": "workspace:*", "cacheable-lookup": "6", diff --git a/packages/types/package.json b/packages/types/package.json index afaa028c09..e89bd1d43e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -19,6 +19,6 @@ "dependencies": { "@ethersproject/abstract-provider": "^5.6.1", "@ethersproject/providers": "^5.7.2", - "@subql/types-core": "^1.1.1" + "@subql/types-core": "^2.0.0" } } diff --git a/yarn.lock b/yarn.lock index 945f94b7ab..a6e3d0ab87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2979,23 +2979,7 @@ __metadata: languageName: unknown linkType: soft -"@subql/common@npm:5.1.1": - version: 5.1.1 - resolution: "@subql/common@npm:5.1.1" - dependencies: - "@subql/types-core": 1.1.1 - axios: ^0.28.0 - class-transformer: ^0.5.1 - class-validator: ^0.14.1 - js-yaml: ^4.1.0 - reflect-metadata: ^0.1.14 - semver: ^7.6.3 - update-notifier: ^5.1.0 - checksum: 7e8eeb5bb0242c178df8f68d38f078799d896837bd260804abcdf44eaa8b2ea1f28823d611d3b1a271e5216d0fc1b4a764a417ad9ac83b5c061e9761cc838ffc - languageName: node - linkType: hard - -"@subql/common@npm:^5.1.3": +"@subql/common@npm:5.1.3, @subql/common@npm:^5.1.3": version: 5.1.3 resolution: "@subql/common@npm:5.1.3" dependencies: @@ -3011,15 +2995,15 @@ __metadata: languageName: node linkType: hard -"@subql/node-core@npm:^14.1.2": - version: 14.1.2 - resolution: "@subql/node-core@npm:14.1.2" +"@subql/node-core@npm:^14.1.6": + version: 14.1.6 + resolution: "@subql/node-core@npm:14.1.6" dependencies: "@apollo/client": ^3.11.2 "@nestjs/common": ^9.4.0 "@nestjs/event-emitter": ^2.0.0 "@nestjs/schedule": ^3.0.1 - "@subql/common": 5.1.1 + "@subql/common": 5.1.3 "@subql/testing": 2.2.1 "@subql/types": 3.11.2 "@subql/utils": 2.14.0 @@ -3039,7 +3023,7 @@ __metadata: toposort-class: ^1.0.1 vm2: ^3.9.19 yargs: ^16.2.0 - checksum: 6d56fcf203f9d0a54aafd519ed1ba526b23aa798850f2dfc984ded8f5fed4cc17d778f8ba6684e823236da5b2356dad4e6c75ba767101febeeeb2ced80e86c8b + checksum: c0096e2567ed3a2aeb09e26a4044e1647948dad583eea07c4f261078ed1001593bd0276ab7a430f711b9ba92a929d333bb206ab624b68ddb55bf7847eba94a74 languageName: node linkType: hard @@ -3056,7 +3040,7 @@ __metadata: "@nestjs/testing": ^9.4.0 "@subql/common": ^5.1.3 "@subql/common-ethereum": "workspace:*" - "@subql/node-core": ^14.1.2 + "@subql/node-core": ^14.1.6 "@subql/testing": ^2.2.1 "@subql/types-ethereum": "workspace:*" "@types/express": ^4.17.13 @@ -3091,7 +3075,7 @@ __metadata: languageName: node linkType: hard -"@subql/types-core@npm:1.1.1, @subql/types-core@npm:^1.1.1": +"@subql/types-core@npm:1.1.1": version: 1.1.1 resolution: "@subql/types-core@npm:1.1.1" checksum: d804ba8f9a9a8bbce36e98ef3dd03e33602495e96ca8e04438c38b6631de102772b5f209de17d78657bcacc9c91f9af02dabd68edb8e6e24a2ca6e681e4636fc @@ -3107,13 +3091,20 @@ __metadata: languageName: node linkType: hard +"@subql/types-core@npm:^2.0.0": + version: 2.0.0 + resolution: "@subql/types-core@npm:2.0.0" + checksum: cb32c8f1eed13eabee65fb9dd0b4b64435ca18e820f640bd29a3e3a0d4c58692df1163fbc66c2dd29b52faab60b4bd895518c5aad63ec81ade5c250bf580619c + languageName: node + linkType: hard + "@subql/types-ethereum@workspace:*, @subql/types-ethereum@workspace:packages/types": version: 0.0.0-use.local resolution: "@subql/types-ethereum@workspace:packages/types" dependencies: "@ethersproject/abstract-provider": ^5.6.1 "@ethersproject/providers": ^5.7.2 - "@subql/types-core": ^1.1.1 + "@subql/types-core": ^2.0.0 languageName: unknown linkType: soft From cd3dfbd90a5ce7f98c44c287cfb9ca9941030884 Mon Sep 17 00:00:00 2001 From: Tate Date: Mon, 21 Oct 2024 06:39:36 +0000 Subject: [PATCH 2/9] `types` change log --- .yarn/versions/79e2df2e.yml | 2 ++ packages/types/CHANGELOG.md | 7 ++++++- packages/types/package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .yarn/versions/79e2df2e.yml diff --git a/.yarn/versions/79e2df2e.yml b/.yarn/versions/79e2df2e.yml new file mode 100644 index 0000000000..1e2c712b1e --- /dev/null +++ b/.yarn/versions/79e2df2e.yml @@ -0,0 +1,2 @@ +undecided: + - "@subql/node-ethereum" diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index 2e46cb527f..0518d39ccc 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [4.0.0] - 2024-10-21 +### Changed +- Update `@subql/types-core` dependency + ## [3.13.1] - 2024-08-16 ### Changed - Update `@subql/types-core` with fix for datasource processors (#337) @@ -149,7 +153,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Sync with main sdk (#14) ## [0.1.0] - 2022-10-31 -[Unreleased]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.13.1...HEAD +[Unreleased]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/4.0.0...HEAD +[4.0.0]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.13.1...types-ethereum/4.0.0 [3.13.1]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.13.0...types-ethereum/3.13.1 [3.13.0]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.12.0...types-ethereum/3.13.0 [3.12.0]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.11.0...types-ethereum/3.12.0 diff --git a/packages/types/package.json b/packages/types/package.json index e89bd1d43e..0ffc302463 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@subql/types-ethereum", - "version": "3.13.1", + "version": "4.0.0", "description": "", "homepage": "https://github.com/subquery/subql", "repository": "github:subquery/subql", From 12295141674d0f55122482777b87b98640b433eb Mon Sep 17 00:00:00 2001 From: Tate Date: Mon, 21 Oct 2024 06:47:23 +0000 Subject: [PATCH 3/9] `node` change log --- .yarn/versions/46cc33b0.yml | 2 ++ packages/node/CHANGELOG.md | 7 ++++++- packages/node/package.json | 2 +- packages/types/CHANGELOG.md | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .yarn/versions/46cc33b0.yml diff --git a/.yarn/versions/46cc33b0.yml b/.yarn/versions/46cc33b0.yml new file mode 100644 index 0000000000..db3f09aceb --- /dev/null +++ b/.yarn/versions/46cc33b0.yml @@ -0,0 +1,2 @@ +undecided: + - "@subql/types-ethereum" diff --git a/packages/node/CHANGELOG.md b/packages/node/CHANGELOG.md index 8281416430..745a366a8d 100644 --- a/packages/node/CHANGELOG.md +++ b/packages/node/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.1.5] - 2024-10-21 +### Changed +- Bump `@subql/node-core` dependency (#347) + ## [5.1.4] - 2024-09-25 ### Changed - Bump common, Added manifest support for query-subgraph. @@ -556,7 +560,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Init release -[Unreleased]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.4...HEAD +[Unreleased]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.5...HEAD +[5.1.5]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.4...node-ethereum/5.1.5 [5.1.4]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.3...node-ethereum/5.1.4 [5.1.3]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.2...node-ethereum/5.1.3 [5.1.2]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.1...node-ethereum/5.1.2 diff --git a/packages/node/package.json b/packages/node/package.json index c170c33164..1c7d8166fd 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -1,6 +1,6 @@ { "name": "@subql/node-ethereum", - "version": "5.1.4", + "version": "5.1.5", "description": "", "author": "Ian He", "license": "GPL-3.0", diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index 0518d39ccc..f16cbb7f0e 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [4.0.0] - 2024-10-21 ### Changed -- Update `@subql/types-core` dependency +- Update `@subql/types-core` dependency (#347) ## [3.13.1] - 2024-08-16 ### Changed From 07c60c1bb7d12199c9bb374e69c9f52884ce7816 Mon Sep 17 00:00:00 2001 From: yoozo Date: Mon, 21 Oct 2024 15:32:15 +0800 Subject: [PATCH 4/9] Delete .yarn/versions/46cc33b0.yml --- .yarn/versions/46cc33b0.yml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .yarn/versions/46cc33b0.yml diff --git a/.yarn/versions/46cc33b0.yml b/.yarn/versions/46cc33b0.yml deleted file mode 100644 index db3f09aceb..0000000000 --- a/.yarn/versions/46cc33b0.yml +++ /dev/null @@ -1,2 +0,0 @@ -undecided: - - "@subql/types-ethereum" From 3cbe93ec1c935dd590d420ecab45150788a1a13a Mon Sep 17 00:00:00 2001 From: yoozo Date: Mon, 21 Oct 2024 15:32:28 +0800 Subject: [PATCH 5/9] Delete .yarn/versions/79e2df2e.yml --- .yarn/versions/79e2df2e.yml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .yarn/versions/79e2df2e.yml diff --git a/.yarn/versions/79e2df2e.yml b/.yarn/versions/79e2df2e.yml deleted file mode 100644 index 1e2c712b1e..0000000000 --- a/.yarn/versions/79e2df2e.yml +++ /dev/null @@ -1,2 +0,0 @@ -undecided: - - "@subql/node-ethereum" From 0a6539c2a9d2ece2e22e57641a7a3062ac662b47 Mon Sep 17 00:00:00 2001 From: Tate Date: Mon, 21 Oct 2024 07:33:40 +0000 Subject: [PATCH 6/9] Remove change log update version --- packages/node/CHANGELOG.md | 4 +--- packages/types/CHANGELOG.md | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/node/CHANGELOG.md b/packages/node/CHANGELOG.md index 745a366a8d..295ab886de 100644 --- a/packages/node/CHANGELOG.md +++ b/packages/node/CHANGELOG.md @@ -6,7 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [5.1.5] - 2024-10-21 ### Changed - Bump `@subql/node-core` dependency (#347) @@ -560,8 +559,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Init release -[Unreleased]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.5...HEAD -[5.1.5]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.4...node-ethereum/5.1.5 +[Unreleased]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.4...HEAD [5.1.4]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.3...node-ethereum/5.1.4 [5.1.3]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.2...node-ethereum/5.1.3 [5.1.2]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/5.1.1...node-ethereum/5.1.2 diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index f16cbb7f0e..8517cf4697 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -6,7 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [4.0.0] - 2024-10-21 ### Changed - Update `@subql/types-core` dependency (#347) @@ -153,8 +152,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Sync with main sdk (#14) ## [0.1.0] - 2022-10-31 -[Unreleased]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/4.0.0...HEAD -[4.0.0]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.13.1...types-ethereum/4.0.0 +[Unreleased]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.13.1...HEAD [3.13.1]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.13.0...types-ethereum/3.13.1 [3.13.0]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.12.0...types-ethereum/3.13.0 [3.12.0]: https://github.com/subquery/subql-ethereum/compare/types-ethereum/3.11.0...types-ethereum/3.12.0 From 0d1de95ace6314cbb8ecc816be56e021d687646c Mon Sep 17 00:00:00 2001 From: Tate Date: Mon, 21 Oct 2024 07:37:35 +0000 Subject: [PATCH 7/9] remove package update version --- packages/node/package.json | 2 +- packages/types/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node/package.json b/packages/node/package.json index 1c7d8166fd..c170c33164 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -1,6 +1,6 @@ { "name": "@subql/node-ethereum", - "version": "5.1.5", + "version": "5.1.4", "description": "", "author": "Ian He", "license": "GPL-3.0", diff --git a/packages/types/package.json b/packages/types/package.json index 0ffc302463..e89bd1d43e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@subql/types-ethereum", - "version": "4.0.0", + "version": "3.13.1", "description": "", "homepage": "https://github.com/subquery/subql", "repository": "github:subquery/subql", From 33762495c09c72c51d2005ec326e885e46ba8c15 Mon Sep 17 00:00:00 2001 From: Tate Date: Tue, 22 Oct 2024 02:22:37 +0000 Subject: [PATCH 8/9] fix build issues --- packages/node/package.json | 4 ++-- packages/node/src/indexer/fetch.service.ts | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/node/package.json b/packages/node/package.json index c170c33164..fc302a44e7 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -9,8 +9,8 @@ "build": "rm -rf dist && tsc -b", "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"", "start": "nest start", - "start:dev": "nodemon", - "start:prod": "node dist/main", + "start:dev": "TZ=utc nodemon", + "start:prod": "TZ=utc node dist/main", "changelog:release": "echo \"Updating changelog $npm_package_version\" && npx chan release $npm_package_version --git-url \"https://github.com/subquery/subql-ethereum\" --release-prefix=\"node-ethereum/\"" }, "homepage": "https://github.com/subquery/subql", diff --git a/packages/node/src/indexer/fetch.service.ts b/packages/node/src/indexer/fetch.service.ts index 67f57c1f9d..cbd2756c6b 100644 --- a/packages/node/src/indexer/fetch.service.ts +++ b/packages/node/src/indexer/fetch.service.ts @@ -41,7 +41,6 @@ export class FetchService extends BaseFetchService< private apiService: ApiService, nodeConfig: NodeConfig, @Inject('IProjectService') projectService: ProjectService, - @Inject('ISubqueryProject') project: SubqueryProject, @Inject('IBlockDispatcher') blockDispatcher: IEthereumBlockDispatcher, dictionaryService: EthDictionaryService, @@ -53,7 +52,6 @@ export class FetchService extends BaseFetchService< super( nodeConfig, projectService, - project.network, blockDispatcher, dictionaryService, eventEmitter, From 195a8e84dbb517ccd25c7debc6663c1e360a0898 Mon Sep 17 00:00:00 2001 From: Tate Date: Tue, 22 Oct 2024 02:27:38 +0000 Subject: [PATCH 9/9] Remove redundant code --- packages/node/src/indexer/fetch.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/node/src/indexer/fetch.service.ts b/packages/node/src/indexer/fetch.service.ts index cbd2756c6b..6cb0a0b6aa 100644 --- a/packages/node/src/indexer/fetch.service.ts +++ b/packages/node/src/indexer/fetch.service.ts @@ -16,7 +16,6 @@ import { StoreCacheService, } from '@subql/node-core'; import { EthereumBlock, SubqlDatasource } from '@subql/types-ethereum'; -import { SubqueryProject } from '../configure/SubqueryProject'; import { EthereumApi } from '../ethereum'; import { calcInterval,