From a65f4ea5410383461cd5915fb77b0389b904d7f0 Mon Sep 17 00:00:00 2001 From: stwiname Date: Wed, 25 Oct 2023 03:34:46 +0000 Subject: [PATCH 1/3] Update @subql deps --- packages/common-ethereum/package.json | 5 ++--- packages/node/package.json | 5 ++--- packages/types/package.json | 4 ++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/common-ethereum/package.json b/packages/common-ethereum/package.json index 1f6c6e7c40..03d17177ed 100644 --- a/packages/common-ethereum/package.json +++ b/packages/common-ethereum/package.json @@ -1,6 +1,6 @@ { "name": "@subql/common-ethereum", - "version": "3.0.6-0", + "version": "3.0.6", "description": "", "scripts": { "build": "rm -rf dist && tsc -b", @@ -34,6 +34,5 @@ "@types/rimraf": "3.0.2", "ejs": "3.1.7", "lodash": "4.17.21" - }, - "stableVersion": "3.0.5" + } } diff --git a/packages/node/package.json b/packages/node/package.json index 5b307b85e6..ab9fadf1d6 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -1,6 +1,6 @@ { "name": "@subql/node-ethereum", - "version": "3.1.1-0", + "version": "3.1.1", "description": "", "author": "Ian He", "license": "GPL-3.0", @@ -65,6 +65,5 @@ "files": [ "/dist", "/bin" - ], - "stableVersion": "3.1.0" + ] } diff --git a/packages/types/package.json b/packages/types/package.json index 10269f217f..2cabc42f1a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -19,6 +19,10 @@ "dependencies": { "@ethersproject/abstract-provider": "^5.6.1", "@subql/types-core": "^0.2.0" +<<<<<<< HEAD }, "stableVersion": "3.1.0" +======= + } +>>>>>>> 2215cb882 (Update @subql deps) } From 857f18fb668da8572be970cea4b609f37e8c4653 Mon Sep 17 00:00:00 2001 From: Scott Twiname Date: Wed, 25 Oct 2023 17:17:12 +1300 Subject: [PATCH 2/3] [release] 20231025 --- packages/common-ethereum/CHANGELOG.md | 5 ++++- packages/node/CHANGELOG.md | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/common-ethereum/CHANGELOG.md b/packages/common-ethereum/CHANGELOG.md index c903c19563..959d7aa662 100644 --- a/packages/common-ethereum/CHANGELOG.md +++ b/packages/common-ethereum/CHANGELOG.md @@ -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.0.6] - 2023-10-25 ### Changed - Update @subql/common @@ -103,7 +105,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/common-ethereum/3.0.5...HEAD +[Unreleased]: https://github.com/subquery/subql-ethereum/compare/common-ethereum/3.0.6...HEAD +[3.0.6]: https://github.com/subquery/subql-ethereum/compare/common-ethereum/3.0.5...common-ethereum/3.0.6 [3.0.5]: https://github.com/subquery/subql-ethereum/compare/common-ethereum/3.0.4...common-ethereum/3.0.5 [3.0.4]: https://github.com/subquery/subql-ethereum/compare/common-ethereum/3.0.3...common-ethereum/3.0.4 [3.0.3]: https://github.com/subquery/subql-ethereum/compare/common-ethereum/3.0.2...common-ethereum/3.0.3 diff --git a/packages/node/CHANGELOG.md b/packages/node/CHANGELOG.md index 929a88dd79..8822688701 100644 --- a/packages/node/CHANGELOG.md +++ b/packages/node/CHANGELOG.md @@ -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.1.1] - 2023-10-25 ### Fixed - Fix crash when creating new dynamic datasources @@ -295,7 +297,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/3.1.0...HEAD +[Unreleased]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/3.1.1...HEAD +[3.1.1]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/3.1.0...node-ethereum/3.1.1 [3.1.0]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/3.0.6...node-ethereum/3.1.0 [3.0.6]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/3.0.5...node-ethereum/3.0.6 [3.0.5]: https://github.com/subquery/subql-ethereum/compare/node-ethereum/3.0.4...node-ethereum/3.0.5 From 3371eda92799e153df5c6c0e05dcd0b48890500b Mon Sep 17 00:00:00 2001 From: Scott Twiname Date: Wed, 25 Oct 2023 17:19:30 +1300 Subject: [PATCH 3/3] Fix merge conflict --- packages/types/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/types/package.json b/packages/types/package.json index 2cabc42f1a..10269f217f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -19,10 +19,6 @@ "dependencies": { "@ethersproject/abstract-provider": "^5.6.1", "@subql/types-core": "^0.2.0" -<<<<<<< HEAD }, "stableVersion": "3.1.0" -======= - } ->>>>>>> 2215cb882 (Update @subql deps) }