Skip to content

Commit

Permalink
Merge branch 'fix/ts-generate-scaffold' of github.com:subquery/subql …
Browse files Browse the repository at this point in the history
…into fix/ts-generate-scaffold
  • Loading branch information
bz888 committed Oct 26, 2023
2 parents ce06511 + c4a9810 commit 1527d01
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 63 deletions.
4 changes: 4 additions & 0 deletions .yarn/versions/82ee57d8.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
undecided:
- "@subql/common"
- "@subql/node"
- "@subql/node-core"
6 changes: 5 additions & 1 deletion packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- ts-manifest compatibility with `codegen:generate` command (#2111)

## [4.1.0] - 2023-10-25
### Changed
- Removed `validate` command from cli, also removed from `@subql/validator` from dependencies (#2121)

### Added
- Multichain support for TypeScript manifest (#2097)
- Support for multi endpoints CLI deployment (#2117)
Expand Down Expand Up @@ -491,7 +494,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- support subcommand codegen
- support subcommand init

[Unreleased]: https://github.com/subquery/subql/compare/cli/4.0.5...HEAD
[Unreleased]: https://github.com/subquery/subql/compare/cli/4.1.0...HEAD
[4.1.0]: https://github.com/subquery/subql/compare/cli/4.0.5...cli/4.1.0
[4.0.5]: https://github.com/subquery/subql/compare/cli/4.0.4...cli/4.0.5
[4.0.4]: https://github.com/subquery/subql/compare/cli/4.0.3...cli/4.0.4
[4.0.3]: https://github.com/subquery/subql/compare/cli/4.0.2...cli/4.0.3
Expand Down
5 changes: 2 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@subql/cli",
"description": "cli for subquery",
"version": "4.0.6-3",
"version": "4.1.0",
"author": "Ian He",
"bin": {
"subql": "./bin/run"
Expand Down Expand Up @@ -89,6 +89,5 @@
"types": "lib/index.d.ts",
"resolutions": {
"node-fetch": "2.6.7"
},
"stableVersion": "4.0.6-2"
}
}
5 changes: 4 additions & 1 deletion packages/common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [3.2.0] - 2023-10-25
### Added
- Multichain support for TypeScript manifests (#2097)

Expand Down Expand Up @@ -332,7 +334,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- init commit

[Unreleased]: https://github.com/subquery/subql/compare/common/3.1.3...HEAD
[Unreleased]: https://github.com/subquery/subql/compare/common/3.2.0...HEAD
[3.2.0]: https://github.com/subquery/subql/compare/common/3.1.3...common/3.2.0
[3.1.3]: https://github.com/subquery/subql/compare/common/3.1.2...common/3.1.3
[3.1.2]: https://github.com/subquery/subql/compare/common/3.1.1...common/3.1.2
[3.1.1]: https://github.com/subquery/subql/compare/common/3.1.0...common/3.1.1
Expand Down
5 changes: 2 additions & 3 deletions packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@subql/common",
"version": "3.1.4-0",
"version": "3.2.0",
"description": "",
"scripts": {
"build": "rm -rf dist && tsc -b",
Expand Down Expand Up @@ -34,6 +34,5 @@
"@types/semver": "^7.3.9",
"@types/tar": "^6.1.1",
"@types/update-notifier": "^6"
},
"stableVersion": "3.1.3"
}
}
5 changes: 4 additions & 1 deletion packages/node-core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [6.1.1] - 2023-10-25
### Fixed
- Not handling TaskFlushedErrors in block dispatchers (#2120)

Expand Down Expand Up @@ -450,7 +452,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Move blockchain agnostic code from `node` to `node-core` package. (#1222)

[Unreleased]: https://github.com/subquery/subql/compare/node-core/6.1.0...HEAD
[Unreleased]: https://github.com/subquery/subql/compare/node-core/6.1.1...HEAD
[6.1.1]: https://github.com/subquery/subql/compare/node-core/6.1.0...node-core/6.1.1
[6.1.0]: https://github.com/subquery/subql/compare/node-core/6.0.4...node-core/6.1.0
[6.0.4]: https://github.com/subquery/subql/compare/node-core/6.0.3...node-core/6.0.4
[6.0.3]: https://github.com/subquery/subql/compare/node-core/6.0.2...node-core/6.0.3
Expand Down
5 changes: 2 additions & 3 deletions packages/node-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@subql/node-core",
"version": "6.1.1-1",
"version": "6.1.1",
"description": "Common node features that are agnostic to blockchains",
"homepage": "https://github.com/subquery/subql",
"repository": "github:subquery/subql",
Expand Down Expand Up @@ -45,6 +45,5 @@
},
"devDependencies": {
"@types/async-lock": "^1"
},
"stableVersion": "6.1.1-0"
}
}
2 changes: 1 addition & 1 deletion packages/node-core/src/utils/autoQueue.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe('AutoQueue', () => {
results.push(r);
})
)
).rejects.toEqual(new Error('Auto queue process task timeout in 0.2 seconds. Please increase --timeout'));
).rejects.toEqual(new Error('Auto Queue process task timeout in 0.2 seconds. Please increase --timeout'));
});

it('can adjust the parallelism while running', async () => {
Expand Down
8 changes: 7 additions & 1 deletion packages/node/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [3.1.1] - 2023-10-25
### Fixed
- Update node-core with fix for crash when creating a dynamic datasource

## [3.1.0] - 2023-10-20
### Added
- Inject in-memory cache to sandbox (#2110)

### Fixed
- Bump with `@subq/node-core` 3.1.0 , fixed poi migration init check, and improve logging

Expand Down Expand Up @@ -1021,7 +1026,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- bump @polkadot/api to 3.1.1

[Unreleased]: https://github.com/subquery/subql/compare/v3.1.0...HEAD
[Unreleased]: https://github.com/subquery/subql/compare/node/3.1.1...HEAD
[3.1.1]: https://github.com/subquery/subql/compare/node/3.1.0...node/3.1.1
[3.1.0]: https://github.com/subquery/subql/compare/v3.0.8...v3.1.0
[3.0.8]: https://github.com/subquery/subql/compare/node/3.0.7...node/3.0.8
[3.0.7]: https://github.com/subquery/subql/compare/node/3.0.6...node/3.0.7
Expand Down
5 changes: 2 additions & 3 deletions packages/node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@subql/node",
"version": "3.1.1-0",
"version": "3.1.1",
"description": "",
"author": "Ian He",
"license": "GPL-3.0",
Expand Down Expand Up @@ -60,6 +60,5 @@
"files": [
"/dist",
"/bin"
],
"stableVersion": "3.1.0"
]
}
65 changes: 19 additions & 46 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6389,43 +6389,7 @@ __metadata:
languageName: unknown
linkType: soft

"@subql/common@npm:3.1.1":
version: 3.1.1
resolution: "@subql/common@npm:3.1.1"
dependencies:
"@subql/types-core": 0.1.1
axios: ^0.27.2
class-transformer: ^0.5.1
class-validator: ^0.14.0
fs-extra: ^10.1.0
ipfs-http-client: 56
js-yaml: ^4.1.0
reflect-metadata: ^0.1.13
semver: ^7.5.2
update-notifier: 5.1.0
checksum: 1d1e3070f0a2f2368a7ba24f9b98012ca88362d51e7e53ed146026aa8c2844e8d58335496a19341facf4422aa2cac89b05e87860b0a4f73e542ca91f8240cdd0
languageName: node
linkType: hard

"@subql/common@npm:^3.1.0, @subql/common@npm:^3.1.1":
version: 3.1.3
resolution: "@subql/common@npm:3.1.3"
dependencies:
"@subql/types-core": 0.1.2-0
axios: ^0.27.2
class-transformer: ^0.5.1
class-validator: ^0.14.0
fs-extra: ^10.1.0
ipfs-http-client: 56
js-yaml: ^4.1.0
reflect-metadata: ^0.1.13
semver: ^7.5.2
update-notifier: 5.1.0
checksum: 2e5f145a44913dda9d8cd5d9cfe1bbda6be8e46ef74b278191f67310ffbfeea6ce76c4ff79c5b6b4a9e21a93d60994bc31db29e7bd198cdafe4203723b59893c
languageName: node
linkType: hard

"@subql/common@workspace:*, @subql/common@workspace:packages/common":
"@subql/common@^3.1.0, @subql/common@^3.1.1, @subql/common@workspace:*, @subql/common@workspace:packages/common":
version: 0.0.0-use.local
resolution: "@subql/common@workspace:packages/common"
dependencies:
Expand All @@ -6450,6 +6414,24 @@ __metadata:
languageName: unknown
linkType: soft

"@subql/common@npm:3.1.1":
version: 3.1.1
resolution: "@subql/common@npm:3.1.1"
dependencies:
"@subql/types-core": 0.1.1
axios: ^0.27.2
class-transformer: ^0.5.1
class-validator: ^0.14.0
fs-extra: ^10.1.0
ipfs-http-client: 56
js-yaml: ^4.1.0
reflect-metadata: ^0.1.13
semver: ^7.5.2
update-notifier: 5.1.0
checksum: 1d1e3070f0a2f2368a7ba24f9b98012ca88362d51e7e53ed146026aa8c2844e8d58335496a19341facf4422aa2cac89b05e87860b0a4f73e542ca91f8240cdd0
languageName: node
linkType: hard

"@subql/node-core@workspace:*, @subql/node-core@workspace:packages/node-core":
version: 0.0.0-use.local
resolution: "@subql/node-core@workspace:packages/node-core"
Expand Down Expand Up @@ -6596,15 +6578,6 @@ __metadata:
languageName: node
linkType: hard

"@subql/types-core@npm:0.1.2-0":
version: 0.1.2-0
resolution: "@subql/types-core@npm:0.1.2-0"
dependencies:
package-json-type: ^1.0.3
checksum: a70258c1cbe8aa407946ed4cd8fa13c6fea72caa0efa1837a4c400c535b0e4d483388d8c54eedd1afa483e65ac85706d637e0112230129e9313a90a552d7244f
languageName: node
linkType: hard

"@subql/types-core@workspace:*, @subql/types-core@workspace:^, @subql/types-core@workspace:packages/types-core":
version: 0.0.0-use.local
resolution: "@subql/types-core@workspace:packages/types-core"
Expand Down

0 comments on commit 1527d01

Please sign in to comment.