From efd08a5f171384a75b551abe40a769c679fd2aa0 Mon Sep 17 00:00:00 2001 From: Scott Twiname Date: Tue, 22 Oct 2024 16:06:57 +1300 Subject: [PATCH] Sync @subql dependencies (#123) * Update @subql deps * change log * fix build issues * Remove redundant code --------- Co-authored-by: yoozo Co-authored-by: Tate --- packages/common-near/CHANGELOG.md | 3 ++ packages/common-near/package.json | 2 +- packages/node/CHANGELOG.md | 3 ++ packages/node/package.json | 8 ++--- packages/node/src/indexer/fetch.service.ts | 3 -- packages/types/CHANGELOG.md | 3 ++ packages/types/package.json | 2 +- yarn.lock | 35 +++++++++++++--------- 8 files changed, 36 insertions(+), 23 deletions(-) diff --git a/packages/common-near/CHANGELOG.md b/packages/common-near/CHANGELOG.md index 3e3e9322..363c88ad 100644 --- a/packages/common-near/CHANGELOG.md +++ b/packages/common-near/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Bump `@subql/common` dependency (#123) + ## [4.1.0] - 2024-08-30 ### Changed - Update `@subql/common` (#119) diff --git a/packages/common-near/package.json b/packages/common-near/package.json index 42dd4315..60e377a1 100644 --- a/packages/common-near/package.json +++ b/packages/common-near/package.json @@ -14,7 +14,7 @@ "main": "dist/index.js", "license": "GPL-3.0", "dependencies": { - "@subql/common": "^5.1.1", + "@subql/common": "^5.1.3", "@subql/types-near": "workspace:*", "js-yaml": "^4.1.0", "reflect-metadata": "^0.1.13" diff --git a/packages/node/CHANGELOG.md b/packages/node/CHANGELOG.md index 8ad23b7a..23e43c1d 100644 --- a/packages/node/CHANGELOG.md +++ b/packages/node/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Bump `@subql/common` and `@subql/node-core` dependency (#123) + ## [4.0.1] - 2024-09-04 ### Fixed - Workers dependencies causing crash (#122) diff --git a/packages/node/package.json b/packages/node/package.json index cc4f128e..da2d9a28 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-near\" --release-prefix=\"node-near/\"" }, "homepage": "https://github.com/subquery/subql", @@ -24,9 +24,9 @@ "@nestjs/event-emitter": "^2.0.0", "@nestjs/platform-express": "^9.4.0", "@nestjs/schedule": "^3.0.1", - "@subql/common": "^5.1.1", + "@subql/common": "^5.1.3", "@subql/common-near": "workspace:*", - "@subql/node-core": "^14.1.2", + "@subql/node-core": "^14.1.6", "@subql/types-near": "workspace:*", "lodash": "^4.17.21", "near-api-js": "^2.1.4", diff --git a/packages/node/src/indexer/fetch.service.ts b/packages/node/src/indexer/fetch.service.ts index 585a1088..e9e518f2 100644 --- a/packages/node/src/indexer/fetch.service.ts +++ b/packages/node/src/indexer/fetch.service.ts @@ -19,7 +19,6 @@ import { } from '@subql/node-core'; import { NearBlock, NearDatasource } from '@subql/types-near'; import { JsonRpcProvider } from 'near-api-js/lib/providers'; -import { SubqueryProject } from '../configure/SubqueryProject'; import { calcInterval, nearHeaderToHeader } from '../utils/near'; import { ApiService } from './api.service'; import { INearBlockDispatcher } from './blockDispatcher'; @@ -40,7 +39,6 @@ export class FetchService extends BaseFetchService< private apiService: ApiService, nodeConfig: NodeConfig, @Inject('IProjectService') projectService: ProjectService, - @Inject('ISubqueryProject') project: SubqueryProject, @Inject('IBlockDispatcher') blockDispatcher: INearBlockDispatcher, dictionaryService: NearDictionaryService, @@ -52,7 +50,6 @@ export class FetchService extends BaseFetchService< super( nodeConfig, projectService, - project.network, blockDispatcher, dictionaryService, eventEmitter, diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index d951f185..99b0e32e 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Bump `@subql/types-core` dependency (#123) + ## [3.5.0] - 2024-08-30 ### Added - Support for network endpoint config (#119) diff --git a/packages/types/package.json b/packages/types/package.json index a22c3314..00e97352 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -17,7 +17,7 @@ "/dist" ], "dependencies": { - "@subql/types-core": "^1.1.1", + "@subql/types-core": "^2.0.0", "bn.js": "5.2.1", "near-api-js": "^1.1.0" }, diff --git a/yarn.lock b/yarn.lock index f332f62d..82300bc7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2637,7 +2637,7 @@ __metadata: version: 0.0.0-use.local resolution: "@subql/common-near@workspace:packages/common-near" dependencies: - "@subql/common": ^5.1.1 + "@subql/common": ^5.1.3 "@subql/types-near": "workspace:*" "@types/bn.js": 5.1.5 "@types/js-yaml": ^4.0.4 @@ -2650,9 +2650,9 @@ __metadata: languageName: unknown linkType: soft -"@subql/common@npm:5.1.1, @subql/common@npm:^5.1.1": - version: 5.1.1 - resolution: "@subql/common@npm:5.1.1" +"@subql/common@npm:5.1.3, @subql/common@npm:^5.1.3": + version: 5.1.3 + resolution: "@subql/common@npm:5.1.3" dependencies: "@subql/types-core": 1.1.1 axios: ^0.28.0 @@ -2662,19 +2662,19 @@ __metadata: reflect-metadata: ^0.1.14 semver: ^7.6.3 update-notifier: ^5.1.0 - checksum: 7e8eeb5bb0242c178df8f68d38f078799d896837bd260804abcdf44eaa8b2ea1f28823d611d3b1a271e5216d0fc1b4a764a417ad9ac83b5c061e9761cc838ffc + checksum: 8946cca78246460c5a9474548b3e83e276fe29e80b4c654213f43ef5c4a4b2f7f4f06c8e124d6b91855084e4afeef0059df33aa8cd7d372c4586b51cc437dbd3 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 @@ -2694,7 +2694,7 @@ __metadata: toposort-class: ^1.0.1 vm2: ^3.9.19 yargs: ^16.2.0 - checksum: 6d56fcf203f9d0a54aafd519ed1ba526b23aa798850f2dfc984ded8f5fed4cc17d778f8ba6684e823236da5b2356dad4e6c75ba767101febeeeb2ced80e86c8b + checksum: c0096e2567ed3a2aeb09e26a4044e1647948dad583eea07c4f261078ed1001593bd0276ab7a430f711b9ba92a929d333bb206ab624b68ddb55bf7847eba94a74 languageName: node linkType: hard @@ -2709,9 +2709,9 @@ __metadata: "@nestjs/schedule": ^3.0.1 "@nestjs/schematics": ^9.2.0 "@nestjs/testing": ^9.4.0 - "@subql/common": ^5.1.1 + "@subql/common": ^5.1.3 "@subql/common-near": "workspace:*" - "@subql/node-core": ^14.1.2 + "@subql/node-core": ^14.1.6 "@subql/types-near": "workspace:*" "@types/express": ^4.17.13 "@types/jest": ^27.4.0 @@ -2740,7 +2740,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 @@ -2756,11 +2756,18 @@ __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-near@workspace:*, @subql/types-near@workspace:packages/types": version: 0.0.0-use.local resolution: "@subql/types-near@workspace:packages/types" dependencies: - "@subql/types-core": ^1.1.1 + "@subql/types-core": ^2.0.0 "@types/app-module-path": ^2.2.0 bn.js: 5.2.1 near-api-js: ^1.1.0