forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-17 18:30:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove legacy testnet validate masternode logic (#603)

Browse source 
* remove legacy testnet validate masternode logic

* remove legacy testnet validate masternode logic

* remove legacy testnet validate masternode logic
This commit is contained in:
Liam 2024-08-12 00:13:36 -07:00 committed by GitHub
parent 9e7b6a97b3
commit e3df8e55a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cmd/XDC/main.go
View file

@ -27,7 +27,6 @@ import (
"github.com/XinFinOrg/XDPoSChain/accounts" "github.com/XinFinOrg/XDPoSChain/accounts"
"github.com/XinFinOrg/XDPoSChain/accounts/keystore" "github.com/XinFinOrg/XDPoSChain/accounts/keystore"
"github.com/XinFinOrg/XDPoSChain/cmd/utils" "github.com/XinFinOrg/XDPoSChain/cmd/utils"
"github.com/XinFinOrg/XDPoSChain/common"
"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS"
"github.com/XinFinOrg/XDPoSChain/console" "github.com/XinFinOrg/XDPoSChain/console"
"github.com/XinFinOrg/XDPoSChain/core" "github.com/XinFinOrg/XDPoSChain/core"
@ -319,16 +318,9 @@ func startNode(ctx *cli.Context, stack *node.Node, cfg XDCConfig) {
ok := false ok := false
slaveMode := ctx.GlobalIsSet(utils.XDCSlaveModeFlag.Name) slaveMode := ctx.GlobalIsSet(utils.XDCSlaveModeFlag.Name)
var err error var err error
if common.IsTestnet { ok, err = ethereum.ValidateMasternode()
ok, err = ethereum.ValidateMasternodeTestnet() if err != nil {
if err != nil { utils.Fatalf("Can't verify masternode permission: %v", err)
utils.Fatalf("Can't verify masternode permission: %v", err)
}
} else {
ok, err = ethereum.ValidateMasternode()
if err != nil {
utils.Fatalf("Can't verify masternode permission: %v", err)
}
} }
if ok { if ok {
if slaveMode { if slaveMode {
@ -360,16 +352,10 @@ func startNode(ctx *cli.Context, stack *node.Node, cfg XDCConfig) {
log.Info("Update consensus parameters") log.Info("Update consensus parameters")
chain := ethereum.BlockChain() chain := ethereum.BlockChain()
engine.UpdateParams(chain.CurrentHeader()) engine.UpdateParams(chain.CurrentHeader())
if common.IsTestnet {
ok, err = ethereum.ValidateMasternodeTestnet() ok, err = ethereum.ValidateMasternode()
if err != nil { if err != nil {
utils.Fatalf("Can't verify masternode permission: %v", err) utils.Fatalf("Can't verify masternode permission: %v", err)
}
} else {
ok, err = ethereum.ValidateMasternode()
if err != nil {
utils.Fatalf("Can't verify masternode permission: %v", err)
}
} }
if !ok { if !ok {
if started { if started {

2
common/constants/constants.go.testnet
View file

@ -54,7 +54,7 @@ var ShanghaiBlock = big.NewInt(61290000) // Target 31st March 2024
var Eip1559Block = big.NewInt(9999999999) var Eip1559Block = big.NewInt(9999999999)
var TIPXDCXTestnet = big.NewInt(23779191) var TIPXDCXTestnet = big.NewInt(23779191)
var IsTestnet bool = false var IsTestnet bool = true
var Enable0xPrefix bool = true var Enable0xPrefix bool = true
var StoreRewardFolder string var StoreRewardFolder string
var RollbackHash Hash var RollbackHash Hash

10
consensus/XDPoS/engines/engine_v1/engine.go
View file

@ -438,16 +438,6 @@ func (x *XDPoS_v1) YourTurn(chain consensus.ChainReader, parent *types.Header, s
func (x *XDPoS_v1) yourTurn(chain consensus.ChainReader, parent *types.Header, signer common.Address) (int, int, int, bool, error) { func (x *XDPoS_v1) yourTurn(chain consensus.ChainReader, parent *types.Header, signer common.Address) (int, int, int, bool, error) {
masternodes := x.GetMasternodes(chain, parent) masternodes := x.GetMasternodes(chain, parent)
// if common.IsTestnet {
// // Only three mns hard code for XDC testnet.
// masternodes = []common.Address{
// common.HexToAddress("0x3Ea0A3555f9B1dE983572BfF6444aeb1899eC58C"),
// common.HexToAddress("0x4F7900282F3d371d585ab1361205B0940aB1789C"),
// common.HexToAddress("0x942a5885A8844Ee5587C8AC5e371Fc39FFE61896"),
// }
// }
snap, err := x.GetSnapshot(chain, parent) snap, err := x.GetSnapshot(chain, parent)
if err != nil { if err != nil {
log.Warn("Failed when trying to commit new work", "err", err) log.Warn("Failed when trying to commit new work", "err", err)

22
eth/backend.go
View file

@ -486,28 +486,6 @@ func (s *Ethereum) ValidateMasternode() (bool, error) {
return true, nil return true, nil
} }
// ValidateMasternodeTestNet checks if node's address is in set of masternodes in Testnet
func (s *Ethereum) ValidateMasternodeTestnet() (bool, error) {
eb, err := s.Etherbase()
if err != nil {
return false, err
}
if s.chainConfig.XDPoS == nil {
return false, errors.New("Only verify masternode permission in XDPoS protocol")
}
masternodes := []common.Address{
common.HexToAddress("0x3Ea0A3555f9B1dE983572BfF6444aeb1899eC58C"),
common.HexToAddress("0x4F7900282F3d371d585ab1361205B0940aB1789C"),
common.HexToAddress("0x942a5885A8844Ee5587C8AC5e371Fc39FFE61896"),
}
for _, m := range masternodes {
if m == eb {
return true, nil
}
}
return false, nil
}
func (s *Ethereum) StartStaking(local bool) error { func (s *Ethereum) StartStaking(local bool) error {
eb, err := s.Etherbase() eb, err := s.Etherbase()
if err != nil { if err != nil {