From 16a6cf9f5548ba51b038c36536987002a01acbdc Mon Sep 17 00:00:00 2001
From: Rongjian Lan <rongjian.lan@gmail.com>
Date: Fri, 6 Dec 2019 20:41:33 -0800
Subject: [PATCH] only propose crosslinks after staking epoch

---
 node/node_newblock.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node/node_newblock.go b/node/node_newblock.go
index 56ba0b352..e4722f13d 100644
--- a/node/node_newblock.go
+++ b/node/node_newblock.go
@@ -127,7 +127,7 @@ func (node *Node) proposeNewBlock() (*types.Block, error) {
 
 	// Prepare cross links
 	var crossLinksToPropose types.CrossLinks
-	if node.NodeConfig.ShardID == 0 {
+	if node.NodeConfig.ShardID == 0 && node.Blockchain().Config().IsStaking(node.Worker.GetCurrentHeader().Epoch()) {
 		node.pendingCLMutex.Lock()
 		allPending, err := node.Blockchain().ReadPendingCrossLinks()
 		node.pendingCLMutex.Unlock()