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

Jump to bottom

release: sync develop to master #451

Merged
merged 4 commits into from
Jun 11, 2024
Merged

release: sync develop to master #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
875a599
Merge pull request #438 from bnb-chain/master
alexgao001 Apr 29, 2024
3f99515
Merge pull request #448 from bnb-chain/master
unclezoro May 27, 2024
48d116d
feat: set up hardfork height and add CHANGELOG.md (#449)
BarryTong65 May 27, 2024
729b8f1
feat: update the block height for veld (#450)
BarryTong65 Jun 11, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## V1.8.0
This release introduces the Veld upgrade

## V1.7.0
This release introduces the Erdos upgrade

Expand Down
3 changes: 3 additions & 0 deletions types/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,7 @@ const (

// Erdos is the upgrade name for Erdos upgrade
Erdos = "Erdos"

// Veld is the upgrade name for Veld upgrade
Veld = "Veld"
)
11 changes: 11 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 @@ -35,6 +35,9 @@ const (

// Erdos is the upgrade name for Erdos upgrade
Erdos = types.Erdos

// Veld is the upgrade name for Veld upgrade
Veld = types.Veld
)

// The default upgrade config for networks
Expand Down Expand Up @@ -76,6 +79,10 @@ var (
Name: Erdos,
Height: 7861456,
Info: "Erdos hardfork",
}).SetPlan(&Plan{
Name: Veld,
Height: 9269910,
Info: "Veld hardfork",
})

TestnetChainID = "greenfield_5600-1"
Expand Down Expand Up @@ -115,6 +122,10 @@ var (
Name: Erdos,
Height: 8116724,
Info: "Erdos hardfork",
}).SetPlan(&Plan{
Name: Veld,
Height: 9581218,
Info: "Veld hardfork",
})
)

Expand Down
Loading