Merge pull request ethereum#17 from ngtuna/dynamic-validator

revise validator set every epoch
ngtuna · May 21, 2018 · 302d2d9 · 302d2d9
2 parents ee4379f + b11297c
commit 302d2d9
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 21 deletions.
diff --git a/cmd/tomo/main.go b/cmd/tomo/main.go
@@ -290,28 +290,67 @@ func startNode(ctx *cli.Context, stack *node.Node) {
 		if err := stack.Service(&ethereum); err != nil {
 			utils.Fatalf("Ethereum service not running: %v", err)
 		}
-
-		// Mining only enabled for validator nodes
-		if ok, err := ethereum.ValidateMiner(); err != nil {
-			utils.Fatalf("Can't verify validator permission: %v", err)
-		} else if !ok {
-			log.Info("Only validator can mine blocks. Cancel mining on this node")
-			return
-		}
-
-		// Use a reduced number of threads if requested
-		if threads := ctx.GlobalInt(utils.MinerThreadsFlag.Name); threads > 0 {
-			type threaded interface {
-				SetThreads(threads int)
+		go func() {
+			started := false
+			ok, err := ethereum.ValidateMiner()
+			if err != nil {
+				utils.Fatalf("Can't verify validator permission: %v", err)
+			}
+			if ok {
+				log.Info("Validator found. Enabling mining mode...")
+				// Use a reduced number of threads if requested
+				if threads := ctx.GlobalInt(utils.MinerThreadsFlag.Name); threads > 0 {
+					type threaded interface {
+						SetThreads(threads int)
+					}
+					if th, ok := ethereum.Engine().(threaded); ok {
+						th.SetThreads(threads)
+					}
+				}
+				// Set the gas price to the limits from the CLI and start mining
+				ethereum.TxPool().SetGasPrice(utils.GlobalBig(ctx, utils.GasPriceFlag.Name))
+				if err := ethereum.StartMining(true); err != nil {
+					utils.Fatalf("Failed to start mining: %v", err)
+				}
+				started = true
+				log.Info("Enabled mining node!!!")
 			}
-			if th, ok := ethereum.Engine().(threaded); ok {
-				th.SetThreads(threads)
+
+			for {
+				if ethereum.Checkpoint() {
+					//Checkpoint!!! It's time to reconcile node's state...
+					ok, err := ethereum.ValidateMiner()
+					if err != nil {
+						utils.Fatalf("Can't verify validator permission: %v", err)
+					}
+					if !ok {
+						log.Info("Only validator can mine blocks. Cancelling mining on this node...")
+						if started {
+							ethereum.StopMining()
+							started = false
+						}
+						log.Info("Cancelled mining mode!!!")
+					} else if !started {
+						log.Info("Validator found. Enabling mining mode...")
+						// Use a reduced number of threads if requested
+						if threads := ctx.GlobalInt(utils.MinerThreadsFlag.Name); threads > 0 {
+							type threaded interface {
+								SetThreads(threads int)
+							}
+							if th, ok := ethereum.Engine().(threaded); ok {
+								th.SetThreads(threads)
+							}
+						}
+						// Set the gas price to the limits from the CLI and start mining
+						ethereum.TxPool().SetGasPrice(utils.GlobalBig(ctx, utils.GasPriceFlag.Name))
+						if err := ethereum.StartMining(true); err != nil {
+							utils.Fatalf("Failed to start mining: %v", err)
+						}
+						started = true
+						log.Info("Enabled mining node!!!")
+					}
+				}
 			}
-		}
-		// Set the gas price to the limits from the CLI and start mining
-		ethereum.TxPool().SetGasPrice(utils.GlobalBig(ctx, utils.GasPriceFlag.Name))
-		if err := ethereum.StartMining(true); err != nil {
-			utils.Fatalf("Failed to start mining: %v", err)
-		}
+		}()
 	}
 }
diff --git a/eth/backend.go b/eth/backend.go
@@ -334,6 +334,7 @@ func (self *Ethereum) SetEtherbase(etherbase common.Address) {
 	self.miner.SetEtherbase(etherbase)
 }
 
+// ValidateMiner checks if node's address is in set of validators
 func (s *Ethereum) ValidateMiner() (bool, error) {
 	eb, err := s.Etherbase()
 	if err != nil {
@@ -356,6 +357,11 @@ func (s *Ethereum) ValidateMiner() (bool, error) {
 	return true, nil
 }
 
+func (s *Ethereum) Checkpoint() bool {
+	number := s.blockchain.CurrentHeader().Number.Uint64()
+	return number%s.chainConfig.Clique.Epoch == 1 || number == 0
+}
+
 func (s *Ethereum) StartMining(local bool) error {
 	eb, err := s.Etherbase()
 	if err != nil {