Add timestamp after txn verification when proposing block

Signed-off-by: Yilun <zyl.skysniper@gmail.com>

chain/mining.go

@@ -17,7 +17,8 @@ import (
 )
 
 type Mining interface {
-	BuildBlock(ctx context.Context, height uint32, chordID []byte, winnerHash common.Uint256, winnerType pb.WinnerType, timestamp int64) (*block.Block, error)
+	BuildBlock(ctx context.Context, height uint32, chordID []byte, winnerHash common.Uint256, winnerType pb.WinnerType) (*block.Block, error)
+	SignBlock(b *block.Block, timestamp int64) error
 }
 
 type BuiltinMining struct {
@@ -32,7 +33,7 @@ func NewBuiltinMining(account *vault.Account, txnCollector *TxnCollector) *Built
 	}
 }
 
-func (bm *BuiltinMining) BuildBlock(ctx context.Context, height uint32, chordID []byte, winnerHash common.Uint256, winnerType pb.WinnerType, timestamp int64) (*block.Block, error) {
+func (bm *BuiltinMining) BuildBlock(ctx context.Context, height uint32, chordID []byte, winnerHash common.Uint256, winnerType pb.WinnerType) (*block.Block, error) {
 	var txnList []*transaction.Transaction
 	var txnHashList []common.Uint256
 
@@ -145,7 +146,6 @@ func (bm *BuiltinMining) BuildBlock(ctx context.Context, height uint32, chordID
 			UnsignedHeader: &pb.UnsignedHeader{
 				Version:          config.HeaderVersion,
 				PrevBlockHash:    curBlockHash.ToArray(),
-				Timestamp:        timestamp,
 				Height:           height,
 				RandomBeacon:     randomBeacon,
 				TransactionsRoot: txnRoot.ToArray(),
@@ -170,14 +170,19 @@ func (bm *BuiltinMining) BuildBlock(ctx context.Context, height uint32, chordID
 
 	header.UnsignedHeader.StateRoot = curStateHash.ToArray()
 
-	hash := signature.GetHashForSigning(header)
+	return block, nil
+}
+
+func (bm *BuiltinMining) SignBlock(b *block.Block, timestamp int64) error {
+	b.Header.UnsignedHeader.Timestamp = timestamp
+
+	hash := signature.GetHashForSigning(b.Header)
 	sig, err := crypto.Sign(bm.account.PrivateKey, hash)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	header.Signature = append(header.Signature, sig...)
-
-	return block, nil
+	b.Header.Signature = append(b.Header.Signature, sig...)
+	return nil
 }
 
 func (bm *BuiltinMining) CreateCoinbaseTransaction(reward common.Fixed64) *transaction.Transaction {

consensus/config.go

@@ -3,6 +3,7 @@ package moca
 import (
 	"time"
 
+	"github.com/nknorg/nkn/chain"
 	"github.com/nknorg/nkn/pb"
 	"github.com/nknorg/nkn/util/config"
 )
@@ -14,7 +15,7 @@ const (
 	minVotingInterval           = 500 * time.Millisecond
 	maxVotingInterval           = 2 * time.Second
 	proposingInterval           = 500 * time.Millisecond
-	proposingTimeout            = config.ConsensusDuration / 10
+	proposingTimeout            = chain.ProposingTimeTolerance * 4 / 5
 	cacheExpiration             = 3600 * time.Second
 	cacheCleanupInterval        = 600 * time.Second
 	proposingStartDelay         = config.ConsensusTimeout + time.Second

consensus/proposing.go

@@ -30,14 +30,25 @@ func (consensus *Consensus) startProposing() {
 
 				ctx, cancel = context.WithTimeout(context.Background(), proposingTimeout)
 
-				block, err := consensus.proposeBlock(ctx, expectedHeight, timestamp)
+				block, err := consensus.proposeBlock(ctx, expectedHeight)
 				if err != nil {
 					log.Errorf("Propose block %d at %v error: %v", expectedHeight, timestamp, err)
 					break
 				}
 
 				cancel()
 
+				timestamp = time.Now().Unix()
+				if !consensus.isBlockProposer(currentHeight, timestamp) {
+					log.Errorf("I'm no longer the block proposer at height %d at %v", expectedHeight, timestamp)
+					break
+				}
+				err = consensus.mining.SignBlock(block, timestamp)
+				if err != nil {
+					log.Errorf("Sign block with timestamp %v error: %v", timestamp, err)
+					break
+				}
+
 				blockHash := block.Hash()
 				log.Infof("Propose block %s at height %d", blockHash.ToHexString(), expectedHeight)
 
@@ -82,11 +93,11 @@ func (consensus *Consensus) isBlockProposer(height uint32, timestamp int64) bool
 }
 
 // proposeBlock proposes a new block at give height and timestamp
-func (consensus *Consensus) proposeBlock(ctx context.Context, height uint32, timestamp int64) (*block.Block, error) {
+func (consensus *Consensus) proposeBlock(ctx context.Context, height uint32) (*block.Block, error) {
 	winnerHash, winnerType, err := chain.GetNextMiningSigChainTxnHash(height)
 	if err != nil {
 		return nil, err
 	}
 
-	return consensus.mining.BuildBlock(ctx, height, consensus.localNode.GetChordID(), winnerHash, winnerType, timestamp)
+	return consensus.mining.BuildBlock(ctx, height, consensus.localNode.GetChordID(), winnerHash, winnerType)
 }