core: clearup testflag for Bohr

cmd/geth/chaincmd.go

@@ -63,7 +63,6 @@ var (
  Flags: flags.Merge([]cli.Flag{
  utils.CachePreimagesFlag,
  utils.OverridePassedForkTime,
- utils.OverrideBohr,
  utils.OverridePascal,
  utils.OverridePrague,
  utils.OverrideVerkle,
@@ -260,10 +259,6 @@ func initGenesis(ctx *cli.Context) error {
  v := ctx.Uint64(utils.OverridePassedForkTime.Name)
  overrides.OverridePassedForkTime = &v
  }
- if ctx.IsSet(utils.OverrideBohr.Name) {
- v := ctx.Uint64(utils.OverrideBohr.Name)
- overrides.OverrideBohr = &v
- }
  if ctx.IsSet(utils.OverridePascal.Name) {
  v := ctx.Uint64(utils.OverridePascal.Name)
  overrides.OverridePascal = &v

cmd/geth/config.go

@@ -191,10 +191,6 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
  v := ctx.Uint64(utils.OverridePassedForkTime.Name)
  cfg.Eth.OverridePassedForkTime = &v
  }
- if ctx.IsSet(utils.OverrideBohr.Name) {
- v := ctx.Uint64(utils.OverrideBohr.Name)
- cfg.Eth.OverrideBohr = &v
- }
  if ctx.IsSet(utils.OverridePascal.Name) {
  v := ctx.Uint64(utils.OverridePascal.Name)
  cfg.Eth.OverridePascal = &v

cmd/geth/main.go

@@ -73,7 +73,6 @@ var (
  utils.SmartCardDaemonPathFlag,
  utils.RialtoHash,
  utils.OverridePassedForkTime,
- utils.OverrideBohr,
  utils.OverridePascal,
  utils.OverridePrague,
  utils.OverrideVerkle,

cmd/utils/flags.go

@@ -313,11 +313,6 @@ var (
  Usage: "Manually specify the hard fork timestamps which have passed on the mainnet, overriding the bundled setting",
  Category: flags.EthCategory,
  }
- OverrideBohr = &cli.Uint64Flag{
- Name: "override.bohr",
- Usage: "Manually specify the Bohr fork timestamp, overriding the bundled setting",
- Category: flags.EthCategory,
- }
  OverridePascal = &cli.Uint64Flag{
  Name: "override.pascal",
  Usage: "Manually specify the Pascal fork timestamp, overriding the bundled setting",

core/genesis.go

@@ -217,7 +217,6 @@ func (e *GenesisMismatchError) Error() string {
 // Typically, these modifications involve hardforks that are not enabled on the BSC mainnet, intended for testing purposes.
 type ChainOverrides struct {
  OverridePassedForkTime *uint64
- OverrideBohr *uint64
  OverridePascal *uint64
  OverridePrague *uint64
  OverrideVerkle *uint64
@@ -254,9 +253,7 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, g
  config.CancunTime = overrides.OverridePassedForkTime
  config.HaberTime = overrides.OverridePassedForkTime
  config.HaberFixTime = overrides.OverridePassedForkTime
- }
- if overrides != nil && overrides.OverrideBohr != nil {
- config.BohrTime = overrides.OverrideBohr
+ config.BohrTime = overrides.OverridePassedForkTime
  }
  if overrides != nil && overrides.OverridePascal != nil {
  config.PascalTime = overrides.OverridePascal

core/systemcontracts/bohr/types.go

@@ -17,11 +17,3 @@ var (
  //go:embed chapel/StakeHubContract
  ChapelStakeHubContract string
 )
-
-// contract codes for Rialto upgrade
-var (
- //go:embed rialto/ValidatorContract
- RialtoValidatorContract string
- //go:embed rialto/StakeHubContract
- RialtoStakeHubContract string
-)

core/systemcontracts/upgrade.go

@@ -776,22 +776,6 @@ func init() {
  },
  }
 
- bohrUpgrade[rialtoNet] = &Upgrade{
- UpgradeName: "bohr",
- Configs: []*UpgradeConfig{
- {
- ContractAddr: common.HexToAddress(ValidatorContract),
- CommitUrl: "https://github.com/bnb-chain/bsc-genesis-contract/commit/398c9364aad5261c1ecd90ac3ab2df89b65c45e3",
- Code: bohr.RialtoValidatorContract,
- },
- {
- ContractAddr: common.HexToAddress(StakeHubContract),
- CommitUrl: "https://github.com/bnb-chain/bsc-genesis-contract/commit/398c9364aad5261c1ecd90ac3ab2df89b65c45e3",
- Code: bohr.RialtoStakeHubContract,
- },
- },
- }
-
  pascalUpgrade[mainNet] = &Upgrade{
  UpgradeName: "pascal",
  Configs: []*UpgradeConfig{

eth/backend.go

@@ -193,12 +193,9 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
  chainConfig.CancunTime = config.OverridePassedForkTime
  chainConfig.HaberTime = config.OverridePassedForkTime
  chainConfig.HaberFixTime = config.OverridePassedForkTime
+ chainConfig.BohrTime = config.OverridePassedForkTime
  overrides.OverridePassedForkTime = config.OverridePassedForkTime
  }
- if config.OverrideBohr != nil {
- chainConfig.BohrTime = config.OverrideBohr
- overrides.OverrideBohr = config.OverrideBohr
- }
  if config.OverridePascal != nil {
  chainConfig.PascalTime = config.OverridePascal
  overrides.OverridePascal = config.OverridePascal

eth/ethconfig/config.go

@@ -191,9 +191,6 @@ type Config struct {
  // OverridePassedForkTime
  OverridePassedForkTime *uint64 `toml:",omitempty"`
 
- // OverrideBohr (TODO: remove after the fork)
- OverrideBohr *uint64 `toml:",omitempty"`
-
  // OverridePascal (TODO: remove after the fork)
  OverridePascal *uint64 `toml:",omitempty"`
 

params/config.go

@@ -244,9 +244,9 @@ var (
  HaberTime: newUint64(0),
  HaberFixTime: newUint64(0),
  BohrTime: newUint64(0),
- // TODO
- PascalTime: newUint64(0),
- PragueTime: newUint64(0),
+ // TODO: set them to `0` when passed on the mainnet
+ PascalTime: nil,
+ PragueTime: nil,
 
  Parlia: &ParliaConfig{
  Period: 3,