Merge pull request ethereum#272 from nextyio/consensus

Consensus for CoLoa hardfork

Author: Zergity

cmd/puppeth/wizard_genesis.go

@@ -124,7 +124,9 @@ func (w *wizard) makeGenesis() {
 			ThangLongBlock: common.Big0,
 			ThangLongEpoch: 3000,
 			// CoLoa hardfork
-			CoLoaBlock: common.Big0,
+			CoLoaBlock:              common.Big0,
+			LeakDuration:            1024,
+			ApplicationConfirmation: 128,
 		}
 		fmt.Println()
 		fmt.Println("How many seconds should blocks take? (default = 2)")
@@ -212,6 +214,15 @@ func (w *wizard) makeGenesis() {
 		fmt.Printf("Which block should CoLoa come into effect? (default = %v)\n", genesis.Config.Dccs.CoLoaBlock)
 		genesis.Config.Dccs.CoLoaBlock = w.readDefaultBigInt(genesis.Config.Dccs.CoLoaBlock)
 
+		// CoLoa hardfork enabled
+		fmt.Println()
+		fmt.Printf("After how many block of inactivity should a sealer is kicked out? (default = %v)\n", genesis.Config.Dccs.LeakDuration)
+		genesis.Config.Dccs.LeakDuration = uint64(w.readDefaultInt(int(genesis.Config.Dccs.LeakDuration)))
+
+		fmt.Println()
+		fmt.Printf("How many confirmations is required before a sealer application takes effect? (default = %v)\n", genesis.Config.Dccs.ApplicationConfirmation)
+		genesis.Config.Dccs.ApplicationConfirmation = uint64(w.readDefaultInt(int(genesis.Config.Dccs.ApplicationConfirmation)))
+
 	default:
 		log.Crit("Invalid consensus engine choice", "choice", choice)
 	}

consensus/dccs/1_dccs.go

@@ -256,12 +256,20 @@ func (d *Dccs) getStateSnapshot(chain consensus.ChainReader, header *types.Heade
 // + the header in parents if available (nessesary for batch headers processing)
 // + chain.GetHeaderByNumber(number), if all else fail
 func getAvailableHeader(number uint64, header *types.Header, parents []*types.Header, chain consensus.ChainReader) *types.Header {
-	headerNumber := header.Number.Uint64()
-	if number == headerNumber {
-		return header
-	}
-	if number > headerNumber {
-		return chain.GetHeaderByNumber(number)
+	var headerNumber uint64
+	if header != nil {
+		headerNumber = header.Number.Uint64()
+		if number == headerNumber {
+			return header
+		}
+		if number > headerNumber {
+			return chain.GetHeaderByNumber(number)
+		}
+	} else {
+		if len(parents) == 0 {
+			return chain.GetHeaderByNumber(number)
+		}
+		headerNumber = parents[len(parents)-1].Number.Uint64() + 1
 	}
 	idx := len(parents) - int(headerNumber) + int(number)
 	if idx >= 0 {