remove legacy testnet validate masternode logic (#603)

* remove legacy testnet validate masternode logic

* remove legacy testnet validate masternode logic

* remove legacy testnet validate masternode logic

Author: liam-lai

cmd/XDC/main.go

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

common/constants/constants.go.testnet

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

consensus/XDPoS/engines/engine_v1/engine.go

@@ -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) {
 	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)
 	if err != nil {
 		log.Warn("Failed when trying to commit new work", "err", err)

eth/backend.go

@@ -486,28 +486,6 @@ func (s *Ethereum) ValidateMasternode() (bool, error) {
 	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 {
 	eb, err := s.Etherbase()
 	if err != nil {