Merge pull request #379 from bnb-chain/master

merge master branch to develop
bnb-chain · Jan 2, 2024 · b47fd23 · b47fd23
2 parents f06e5c9 + ae1e4fb
commit b47fd23
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.2.1
+This release changes the Manchurian upgrade height of testnet.
+
+Features:
+* [#374](https://github.com/bnb-chain/greenfield/pull/374) feat: modify Manchurian hardfork height of testnet
+
 ## V1.2.0
 This release introduce the Manchurian upgrade to the testnet.
 

diff --git a/x/upgrade/types/upgrade_config.go b/x/upgrade/types/upgrade_config.go
@@ -45,6 +45,10 @@ var (
 		Name:   Pampas,
 		Height: 2427233,
 		Info:   "Pampas hardfork",
+	}).SetPlan(&Plan{
+		Name:   Manchurian,
+		Height: 3922485,
+		Info:   "Manchurian hardfork",
 	})
 )