mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-20 02:42:27 +00:00
remove testnet hard-fork
This commit is contained in:
parent
f94b2cac64
commit
04f532a9fb
3 changed files with 6 additions and 10 deletions
|
|
@ -21,7 +21,6 @@ const (
|
|||
)
|
||||
|
||||
var TIP2019Block = big.NewInt(1050000)
|
||||
var TestnetHF1 = uint64(909000)
|
||||
var IsTestnet = false
|
||||
var StoreRewardFolder string
|
||||
var RollbackHash Hash
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ func (c *Posv) verifyHeaderWithCache(chain consensus.ChainReader, header *types.
|
|||
// looking those up from the database. This is useful for concurrently verifying
|
||||
// a batch of new headers.
|
||||
func (c *Posv) verifyHeader(chain consensus.ChainReader, header *types.Header, parents []*types.Header, fullVerify bool) error {
|
||||
if common.IsTestnet && header.Number.Uint64() >= common.TestnetHF1 {
|
||||
if common.IsTestnet {
|
||||
fullVerify = false
|
||||
}
|
||||
if header.Number == nil {
|
||||
|
|
@ -489,13 +489,10 @@ func (c *Posv) YourTurn(chain consensus.ChainReader, parent *types.Header, signe
|
|||
|
||||
if common.IsTestnet {
|
||||
// Only three mns hard code for tomo testnet.
|
||||
masternodes = masternodes[:3]
|
||||
if parent.Number.Uint64() >= common.TestnetHF1 {
|
||||
masternodes = []common.Address{
|
||||
common.HexToAddress("0xfFC679Dcdf444D2eEb0491A998E7902B411CcF20"),
|
||||
common.HexToAddress("0xd76fd76F7101811726DCE9E43C2617706a4c45c8"),
|
||||
common.HexToAddress("0x8A97753311aeAFACfd76a68Cf2e2a9808d3e65E8"),
|
||||
}
|
||||
masternodes = []common.Address{
|
||||
common.HexToAddress("0xfFC679Dcdf444D2eEb0491A998E7902B411CcF20"),
|
||||
common.HexToAddress("0xd76fd76F7101811726DCE9E43C2617706a4c45c8"),
|
||||
common.HexToAddress("0x8A97753311aeAFACfd76a68Cf2e2a9808d3e65E8"),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -580,7 +580,7 @@ func (s *Ethereum) ValidateMasternode() (bool, error) {
|
|||
} else {
|
||||
return false, fmt.Errorf("Only verify masternode permission in PoSV protocol")
|
||||
}
|
||||
if common.IsTestnet && s.blockchain.CurrentHeader().Number.Uint64() >= common.TestnetHF1 {
|
||||
if common.IsTestnet {
|
||||
masternodes := []common.Address{
|
||||
common.HexToAddress("0xfFC679Dcdf444D2eEb0491A998E7902B411CcF20"),
|
||||
common.HexToAddress("0xd76fd76F7101811726DCE9E43C2617706a4c45c8"),
|
||||
|
|
|
|||
Loading…
Reference in a new issue