fix shard state update bug (#439)

core/blockchain.go

@@ -1244,11 +1244,15 @@ func (bc *BlockChain) insertChain(chain types.Blocks) (int, []interface{}, []*ty
 
 		cache, _ := bc.stateCache.TrieDB().Size()
 		stats.report(chain, i, cache)
+
+		// only insert new shardstate when block is epoch block
+		bc.InsertNewShardState(block)
 	}
 	// Append a single chain head event if we've progressed the chain
 	if lastCanon != nil && bc.CurrentBlock().Hash() == lastCanon.Hash() {
 		events = append(events, ChainHeadEvent{lastCanon})
 	}
+
 	return 0, events, coalescedLogs, nil
 }
 

node/node_handler.go

@@ -277,8 +277,6 @@ func (node *Node) AddNewBlock(newBlock *types.Block) {
 	} else {
 		utils.GetLogInstance().Info("adding new block to blockchain", "blockNum", blockNum)
 	}
-	// only insert new shardstate when newBlock is epoch block
-	node.blockchain.InsertNewShardState(newBlock)
 }
 
 func (node *Node) pingMessageHandler(msgPayload []byte) int {