Merge pull request ethereum#194 from ngtuna/signed-recently

adjust condition for `signed recently` check
ngtuna · Sep 27, 2018 · 904ba53 · 904ba53
2 parents e20d979 + 205878c
commit 904ba53
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 50 deletions.
diff --git a/cmd/tomo/config.go b/cmd/tomo/config.go
@@ -20,12 +20,12 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
+	"gopkg.in/urfave/cli.v1"
 	"io"
 	"os"
 	"reflect"
-	"unicode"
 	"strings"
-	"gopkg.in/urfave/cli.v1"
+	"unicode"
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/dashboard"
@@ -151,7 +151,7 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, tomoConfig) {
 		ctx.Set(utils.NATFlag.Name, cfg.NAT)
 	}
 
-	// read passwords from enviroment
+	// read passwords from environment
 	passwords := []string{}
 	for _, env := range cfg.Account.Passwords {
 		if trimmed := strings.TrimSpace(env); trimmed != "" {

diff --git a/cmd/tomo/main.go b/cmd/tomo/main.go
@@ -321,40 +321,37 @@ func startNode(ctx *cli.Context, stack *node.Node, cfg tomoConfig) {
 				log.Info("Enabled staking node!!!")
 			}
 			defer close(core.CheckpointCh)
-			for {
-				select {
-				case <-core.CheckpointCh:
-					log.Info("Checkpoint!!! It's time to reconcile node's state...")
-					ok, err := ethereum.ValidateStaker()
-					if err != nil {
-						utils.Fatalf("Can't verify masternode permission: %v", err)
+			for range core.CheckpointCh {
+				log.Info("Checkpoint!!! It's time to reconcile node's state...")
+				ok, err := ethereum.ValidateStaker()
+				if err != nil {
+					utils.Fatalf("Can't verify masternode permission: %v", err)
+				}
+				if !ok {
+					if started {
+						log.Info("Only masternode can propose and verify blocks. Cancelling staking on this node...")
+						ethereum.StopStaking()
+						started = false
+						log.Info("Cancelled mining mode!!!")
 					}
-					if !ok {
-						if started {
-							log.Info("Only masternode can propose and verify blocks. Cancelling staking on this node...")
-							ethereum.StopStaking()
-							started = false
-							log.Info("Cancelled mining mode!!!")
-						}
-					} else if !started {
-						log.Info("Masternode found. Enabling staking mode...")
-						// Use a reduced number of threads if requested
-						if threads := ctx.GlobalInt(utils.StakerThreadsFlag.Name); threads > 0 {
-							type threaded interface {
-								SetThreads(threads int)
-							}
-							if th, ok := ethereum.Engine().(threaded); ok {
-								th.SetThreads(threads)
-							}
+				} else if !started {
+					log.Info("Masternode found. Enabling staking mode...")
+					// Use a reduced number of threads if requested
+					if threads := ctx.GlobalInt(utils.StakerThreadsFlag.Name); threads > 0 {
+						type threaded interface {
+							SetThreads(threads int)
 						}
-						// Set the gas price to the limits from the CLI and start mining
-						ethereum.TxPool().SetGasPrice(cfg.Eth.GasPrice)
-						if err := ethereum.StartStaking(true); err != nil {
-							utils.Fatalf("Failed to start staking: %v", err)
+						if th, ok := ethereum.Engine().(threaded); ok {
+							th.SetThreads(threads)
 						}
-						started = true
-						log.Info("Enabled staking node!!!")
 					}
+					// Set the gas price to the limits from the CLI and start mining
+					ethereum.TxPool().SetGasPrice(cfg.Eth.GasPrice)
+					if err := ethereum.StartStaking(true); err != nil {
+						utils.Fatalf("Failed to start staking: %v", err)
+					}
+					started = true
+					log.Info("Enabled staking node!!!")
 				}
 			}
 		}()

diff --git a/consensus/posv/posv.go b/consensus/posv/posv.go
@@ -575,13 +575,16 @@ func (c *Posv) verifySeal(chain consensus.ChainReader, header *types.Header, par
 			return errUnauthorized
 		}
 	}
-	for seen, recent := range snap.Recents {
-		if recent == signer {
-			// Signer is among recents, only fail if the current block doesn't shift it out
-			if limit := uint64(len(masternodes)/2 + 1); seen > number-limit {
-				// Only take into account the non-epoch blocks
-				if number%c.config.Epoch != 0 {
-					return errUnauthorized
+	if len(masternodes) > 1 {
+		for seen, recent := range snap.Recents {
+			if recent == signer {
+				// Signer is among recents, only fail if the current block doesn't shift it out
+				// There is only case that we don't allow signer to create two continuous blocks.
+				if limit := uint64(2); seen > number-limit {
+					// Only take into account the non-epoch blocks
+					if number%c.config.Epoch != 0 {
+						return errUnauthorized
+					}
 				}
 			}
 		}
@@ -755,16 +758,20 @@ func (c *Posv) Seal(chain consensus.ChainReader, block *types.Block, stop <-chan
 		}
 	}
 	// If we're amongst the recent signers, wait for the next block
-	for seen, recent := range snap.Recents {
-		if recent == signer {
-			// Signer is among recents, only wait if the current block doesn't shift it out
-			if limit := uint64(len(masternodes)/2 + 1); number < limit || seen > number-limit {
-				// Only take into account the non-epoch blocks
-				if number%c.config.Epoch != 0 {
-					log.Info("Debugging", "len(masternodes)", len(masternodes), "number", number, "limit", limit, "seen", seen, "recent", recent.String(), "snap.Recents", snap.Recents)
-					log.Info("Signed recently, must wait for others")
-					<-stop
-					return nil, nil
+	// only check recent signers if there are more than one signer.
+	if len(masternodes) > 1 {
+		for seen, recent := range snap.Recents {
+			if recent == signer {
+				// Signer is among recents, only wait if the current block doesn't shift it out
+				// There is only case that we don't allow signer to create two continuous blocks.
+				if limit := uint64(2); number < limit || seen > number-limit {
+					// Only take into account the non-epoch blocks
+					if number%c.config.Epoch != 0 {
+						log.Info("Debugging", "len(masternodes)", len(masternodes), "number", number, "limit", limit, "seen", seen, "recent", recent.String(), "snap.Recents", snap.Recents)
+						log.Info("Signed recently, must wait for others")
+						<-stop
+						return nil, nil
+					}
 				}
 			}
 		}