diff --git a/CHANGELOG.md b/CHANGELOG.md index 34dd319ae..70912559f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Change log -## [v6.0.0-rc0] +## [v6.0.0] ### Features diff --git a/cmd/doctor.go b/cmd/doctor.go index 868b3aa65..4a147b5af 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -289,6 +289,8 @@ func checkBlockchainData(bc blockchain, genesisId, privValidatorKeyFile string) fmt.Printf("%sVersion: v3\n", SPACE) } else if blockHeight < fxtypes.MainnetBlockHeightV5 { fmt.Printf("%sVersion: V4\n", SPACE) + } else if blockHeight < fxtypes.MainnetBlockHeightV6 { + fmt.Printf("%sVersion: V5\n", SPACE) } } if chainId == fxtypes.TestnetChainId { diff --git a/server/start.go b/server/start.go index adc4ff0a0..c3a83a134 100644 --- a/server/start.go +++ b/server/start.go @@ -664,7 +664,10 @@ func checkMainnetAndBlock(genesisDoc *tmtypes.GenesisDoc, config *tmcfg.Config) return errors.New("invalid version: The current block height is less than the v5.0.0 upgrade height(11_601_700)," + " please use the v4.x.x version to synchronize the block or download the latest snapshot") } - return errors.New("invalid version: The current version is not released, please use the corresponding version") + if blockStore.Height() < fxtypes.MainnetBlockHeightV6 { + return errors.New("invalid version: The current block height is less than the v6.0.0 upgrade height(13_598_000)," + + " please use the v5.x.x version to synchronize the block or download the latest snapshot") + } } return nil } diff --git a/types/version.go b/types/version.go index 33d1a92a7..0327a6301 100644 --- a/types/version.go +++ b/types/version.go @@ -18,6 +18,7 @@ const ( MainnetBlockHeightV3 = 8_756_000 MainnetBlockHeightV4 = 10_477_500 MainnetBlockHeightV5 = 11_601_700 + MainnetBlockHeightV6 = 13_598_000 ) // testnet