From f06e5c95769319a87a2e758a0d95ef4ac8ba7652 Mon Sep 17 00:00:00 2001 From: Alexxxxxx <118710506+alexgao001@users.noreply.github.com> Date: Fri, 22 Dec 2023 11:16:50 +0800 Subject: [PATCH 1/2] feat: introduce the Hulunbeier upgrade (#368) * introduce the Hulunbeier upgrade * remove the labeler.yaml file --- .github/labeler.yml | 60 ------------------------------- .github/workflows/labeler.yml | 17 --------- types/upgrade.go | 3 ++ x/upgrade/types/upgrade_config.go | 3 ++ 4 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 .github/labeler.yml delete mode 100644 .github/workflows/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml deleted file mode 100644 index bd2ea73dda..0000000000 --- a/.github/labeler.yml +++ /dev/null @@ -1,60 +0,0 @@ -"C:x/auth": - - x/auth/**/* -"C:x/authz": - - x/authz/**/* -"C:x/bank": - - x/bank/**/* -"C:x/capability": - - x/capability/**/* -"C:x/crisis": - - x/crisis/**/* -"C:x/distribution": - - x/distribution/**/* -"C:x/evidence": - - x/evidence/**/* -"C:x/feegrant": - - x/feegrant/**/* -"C:x/genutil": - - x/genutil/**/* -"C:x/gov": - - x/gov/**/* -"C:x/group": - - x/group/**/* -"C:x/mint": - - x/mint/**/* -"C:x/nft": - - x/nft/**/* -"C:x/params": - - x/params/**/* -"C:Simulations": - - x/simulation/**/* - - x/*/simulation/**/* -"C:x/slashing": - - x/slashing/**/* -"C:x/staking": - - x/staking/**/* -"C:x/upgrade": - - x/upgrade/**/* -"C:Keys": - - client/keys/**/* -"Type: Build": - - Makefile - - Dockerfile - - docker-compose.yml - - scripts/* -"Type: CI": - - .github/**/*.yml - - buf.yaml - - .mergify.yml - - .golangci.yml -"C:CLI": - - client/**/* - - x/*/client/**/* -"Type: ADR": - - docs/architecture/**/* -"C:container": - - container/**/* -"C:Store": - - store/**/* -"C:orm": - - orm/**/* diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml deleted file mode 100644 index 2d9b4acec7..0000000000 --- a/.github/workflows/labeler.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: "Pull Request Labeler" -on: - - pull_request_target - -permissions: - contents: read - -jobs: - labeler: - permissions: - contents: read # for actions/labeler to determine modified files - pull-requests: write # for actions/labeler to add labels to PRs - runs-on: ubuntu-latest - steps: - - uses: actions/labeler@main - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file diff --git a/types/upgrade.go b/types/upgrade.go index fbeee19c58..415fd4c498 100644 --- a/types/upgrade.go +++ b/types/upgrade.go @@ -12,4 +12,7 @@ const ( // Manchurian is the upgrade name for Manchurian upgrade Manchurian = "Manchurian" + + // Hulunbeier is the upgrade name for Hulunbeier upgrade + Hulunbeier = "Hulunbeier" ) diff --git a/x/upgrade/types/upgrade_config.go b/x/upgrade/types/upgrade_config.go index 0f738ea3be..1b59cb06ce 100644 --- a/x/upgrade/types/upgrade_config.go +++ b/x/upgrade/types/upgrade_config.go @@ -18,6 +18,9 @@ const ( // Manchurian is the upgrade name for Manchurian upgrade Manchurian = types.Manchurian + + // Hulunbeier is the upgrade name for Hulunbeier upgrade + Hulunbeier = "Hulunbeier" ) // The default upgrade config for networks From 5517b655605fc0c829d3e69143743562c3f4317a Mon Sep 17 00:00:00 2001 From: Alexxxxxx <118710506+alexgao001@users.noreply.github.com> Date: Tue, 2 Jan 2024 11:26:46 +0800 Subject: [PATCH 2/2] feat: introduces hulunbeier-patch upgrade (#380) * introduces hulunbeier-patch upgrade * add CHANGELOG.md --- CHANGELOG.md | 7 +++++++ types/upgrade.go | 2 ++ x/upgrade/types/upgrade_config.go | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 908bb4dc6f..7adcb1143b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## v1.3.0 +This release introduces the Hulunbeier upgrade. + +Features: +* [#368](https://github.com/bnb-chain/greenfield-cosmos-sdk/pull/368) feat: introduce the Hulunbeier upgrade +* [#376](https://github.com/bnb-chain/greenfield-cosmos-sdk/pull/376) feat: introduces hulunbeierPatch upgrade + ## v1.2.1 This release changes the Manchurian upgrade height of testnet. diff --git a/types/upgrade.go b/types/upgrade.go index 415fd4c498..4b8b16eb1e 100644 --- a/types/upgrade.go +++ b/types/upgrade.go @@ -15,4 +15,6 @@ const ( // Hulunbeier is the upgrade name for Hulunbeier upgrade Hulunbeier = "Hulunbeier" + + HulunbeierPatch = "HulunbeierPatch" ) diff --git a/x/upgrade/types/upgrade_config.go b/x/upgrade/types/upgrade_config.go index fa31bf53fd..22ef92efec 100644 --- a/x/upgrade/types/upgrade_config.go +++ b/x/upgrade/types/upgrade_config.go @@ -20,7 +20,9 @@ const ( Manchurian = types.Manchurian // Hulunbeier is the upgrade name for Hulunbeier upgrade - Hulunbeier = "Hulunbeier" + Hulunbeier = types.Hulunbeier + + HulunbeierPatch = types.HulunbeierPatch ) // The default upgrade config for networks