Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge master branch to develop #379

Merged
merged 9 commits into from
Jan 2, 2024
Merged

merge master branch to develop #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da824c3
Merge pull request #356 from bnb-chain/develop
j75689 Nov 13, 2023
2a8e68a
Merge pull request #362 from bnb-chain/develop
j75689 Nov 23, 2023
0855e09
Merge pull request #367 from bnb-chain/develop
unclezoro Dec 6, 2023
5bfb6e0
feat: enable Manchurian hardfork to testnet
j75689 Dec 14, 2023
3def4b0
Merge pull request #369 from bnb-chain/feat--enable-Manchurian-hardfo…
j75689 Dec 14, 2023
fd9d081
feat: modify Manchurian hardfork height of testnet
pythonberg1997 Dec 25, 2023
4a467fb
Merge pull request #374 from Pythonberg1997/develop
keefel Dec 25, 2023
629aa3b
release: prepare for release v1.2.1
pythonberg1997 Dec 25, 2023
ae1e4fb
Merge pull request #375 from Pythonberg1997/develop
unclezoro Dec 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
4 changes: 4 additions & 0 deletions x/upgrade/types/upgrade_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ var (
Name: Pampas,
Height: 2427233,
Info: "Pampas hardfork",
}).SetPlan(&Plan{
Name: Manchurian,
Height: 3922485,
Info: "Manchurian hardfork",
})
)

Expand Down
Loading