Skip to content

Commit

Permalink
[release] 20230601 eth (#96)
Browse files Browse the repository at this point in the history
  • Loading branch information
stwiname authored Jun 1, 2023
1 parent bcb9a69 commit d55424b
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 21 deletions.
6 changes: 5 additions & 1 deletion packages/common-ethereum/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ All logs must start with the format: [x.y.z] - yyyy-mm-dd

## [Unreleased]

## [2.1.0] - 2023-05-1
## [2.1.1] - 2023-06-01
### Changed
- Update common package (#94)

## [2.1.0] - 2023-05-01
### Removed
- Support for manifest versions < 1.0.0
- Use more code from common package
Expand Down
5 changes: 2 additions & 3 deletions packages/common-ethereum/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@subql/common-ethereum",
"version": "2.1.1-1",
"version": "2.1.1",
"description": "",
"scripts": {
"build": "rm -rf dist && tsc -b",
Expand All @@ -27,6 +27,5 @@
"devDependencies": {
"@types/js-yaml": "^4.0.4",
"@types/pino": "^6.3.12"
},
"stableVersion": "2.1.1-0"
}
}
9 changes: 8 additions & 1 deletion packages/node/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.5.0] - 2023-06-01
### Added
- add timestamp to ethTransaction (#93)

### Fixed
- Running projects from IPFS with workers. Update node-core, apply fixes from main sdk (#94)

## [2.2.2] - 2023-05-22
### Changed
Expand Down Expand Up @@ -109,7 +115,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Retry request when encouraging timeout/rate limit behaviours (#9)

## [0.1.0] - 2022-10-31
[Unreleased]: https://github.com/subquery/subql-ethereum/compare/node/v2.2.2...HEAD
[Unreleased]: https://github.com/subquery/subql-ethereum/compare/node/2.5.0...HEAD
[2.5.0]: https://github.com/subquery/subql-ethereum/compare/node/2.2.2...node/2.5.0
[2.2.2]: https://github.com/subquery/subql-ethereum/compare/node/v2.2.0.../node/v2.2.2
[2.2.0]: https://github.com/subquery/subql-ethereum/compare/node/v2.1.2.../node/v2.2.0
[2.1.2]: https://github.com/subquery/subql-ethereum/compare/node/v2.1.0.../node/v2.1.2
Expand Down
7 changes: 3 additions & 4 deletions packages/node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@subql/node-ethereum",
"version": "2.2.3-2",
"version": "2.5.0",
"description": "",
"author": "Ian He",
"license": "Apache-2.0",
Expand All @@ -26,7 +26,7 @@
"@nestjs/schedule": "^1.0.2",
"@subql/common": "^2.2.0",
"@subql/common-ethereum": "workspace:*",
"@subql/node-core": "^2.4.1",
"@subql/node-core": "^2.4.2",
"@subql/testing": "^2.0.0",
"@subql/types": "^2.1.2",
"@subql/types-ethereum": "workspace:*",
Expand Down Expand Up @@ -67,6 +67,5 @@
"files": [
"/dist",
"/bin"
],
"stableVersion": "2.2.3-1"
]
}
11 changes: 8 additions & 3 deletions packages/node/src/configure/configure.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,20 @@ export class ConfigureModule {
let rawManifest: unknown;
let reader: Reader;

const isTest = argv._[0] === 'test';

// Override order : Sub-command/Args/Flags > Manifest Runner options > Default configs
// Therefore, we should rebase the manifest runner options with args first but not the config in the end
if (argv.config) {
// get manifest options
config = NodeConfig.fromFile(argv.config, yargsToIConfig(argv));
config = NodeConfig.fromFile(argv.config, yargsToIConfig(argv), isTest);
reader = await ReaderFactory.create(config.subquery, {
ipfs: config.ipfs,
});
rawManifest = await reader.getProjectSchema();
rebaseArgsWithManifest(argv, rawManifest);
// use rebased argv generate config to override current config
config = NodeConfig.rebaseWithArgs(config, yargsToIConfig(argv));
config = NodeConfig.rebaseWithArgs(config, yargsToIConfig(argv), isTest);
} else {
if (!argv.subquery) {
logger.error(
Expand All @@ -94,7 +96,10 @@ export class ConfigureModule {
rawManifest = await reader.getProjectSchema();
rebaseArgsWithManifest(argv, rawManifest);
// Create new nodeConfig with rebased argv
config = new NodeConfig(defaultSubqueryName(yargsToIConfig(argv)));
config = new NodeConfig(
defaultSubqueryName(yargsToIConfig(argv)),
isTest,
);
}

if (!validDbSchemaName(config.dbSchema)) {
Expand Down
7 changes: 6 additions & 1 deletion packages/types/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.2.2] - 2023-06-01
### Added
- add timestamp to ethTransaction (#93)

## [2.2.1] - 2023-05-22
### Fixed
- Previous release failed
Expand Down Expand Up @@ -48,7 +52,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/v2.2.1...HEAD
[Unreleased]: https://github.com/subquery/subql-ethereum/compare/types/2.2.2...HEAD
[2.2.2]: https://github.com/subquery/subql-ethereum/compare/types/2.2.1...types/2.2.2
[2.2.1]: https://github.com/subquery/subql-ethereum/compare/types/v2.2.0...types/v2.2.1
[2.2.0]: https://github.com/subquery/subql-ethereum/compare/types/v2.1.0...types/v2.2.0
[2.1.0]: https://github.com/subquery/subql-ethereum/compare/types/2.0.0v.../types/v2.1.0
Expand Down
5 changes: 2 additions & 3 deletions packages/types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@subql/types-ethereum",
"version": "2.2.2-0",
"version": "2.2.2",
"description": "",
"homepage": "https://github.com/subquery/subql",
"repository": "github:subquery/subql",
Expand All @@ -17,6 +17,5 @@
],
"dependencies": {
"@ethersproject/abstract-provider": "^5.6.1"
},
"stableVersion": "2.2.1"
}
}
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2747,9 +2747,9 @@ __metadata:
languageName: node
linkType: hard

"@subql/node-core@npm:^2.4.1":
version: 2.4.1
resolution: "@subql/node-core@npm:2.4.1"
"@subql/node-core@npm:^2.4.2":
version: 2.4.2
resolution: "@subql/node-core@npm:2.4.2"
dependencies:
"@nestjs/common": ^8.2.6
"@nestjs/event-emitter": ^1.3.0
Expand All @@ -2774,7 +2774,7 @@ __metadata:
tar: ^6.1.11
vm2: ^3.9.19
yargs: ^16.2.0
checksum: 126983f76d9780452e593290acdf015be930d4d5cd0f554c9ad23f714d99de8fa1638186fe90f4892171cb9c00431867eed458b7360832064851af7aecd68712
checksum: ece800d3f03e45dbce5f3d4913ba5369f54c8c7ef63ab3d1447f748b8a90cd2c0609724d2004a96c97cee5652b0b9ad208bf757853b128206f2c9e40c7c073bd
languageName: node
linkType: hard

Expand All @@ -2792,7 +2792,7 @@ __metadata:
"@nestjs/testing": ^8.2.6
"@subql/common": ^2.2.0
"@subql/common-ethereum": "workspace:*"
"@subql/node-core": ^2.4.1
"@subql/node-core": ^2.4.2
"@subql/testing": ^2.0.0
"@subql/types": ^2.1.2
"@subql/types-ethereum": "workspace:*"
Expand Down

0 comments on commit d55424b

Please sign in to comment.