cmd, dashboard, eth, p2p: separate full nodes from light ones on the dashboard

cmd/geth/config.go

@@ -152,9 +152,6 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 	stack, cfg := makeConfigNode(ctx)
 	utils.RegisterEthService(stack, &cfg.Eth)
 
-	if ctx.GlobalBool(utils.DashboardEnabledFlag.Name) {
-		utils.RegisterDashboardService(stack, &cfg.Dashboard, gitCommit)
-	}
 	// Whisper must be explicitly enabled by specifying at least 1 whisper flag or in dev mode
 	shhEnabled := enableWhisper(ctx)
 	shhAutoEnabled := !ctx.GlobalIsSet(utils.WhisperEnabledFlag.Name) && ctx.GlobalIsSet(utils.DeveloperFlag.Name)
@@ -178,6 +175,12 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 	if cfg.Ethstats.URL != "" {
 		utils.RegisterEthStatsService(stack, cfg.Ethstats.URL)
 	}
+
+	// Add dashboard daemon if requested. This should be the last registered service
+	// in order to be able to collect information about the other services.
+	if ctx.GlobalBool(utils.DashboardEnabledFlag.Name) {
+		utils.RegisterDashboardService(stack, &cfg.Dashboard, gitCommit)
+	}
 	return stack
 }
 

cmd/utils/flags.go

@@ -1535,9 +1535,18 @@ func RegisterEthService(stack *node.Node, cfg *eth.Config) {
 
 // RegisterDashboardService adds a dashboard to the stack.
 func RegisterDashboardService(stack *node.Node, cfg *dashboard.Config, commit string) {
-	stack.Register(func(ctx *node.ServiceContext) (node.Service, error) {
-		return dashboard.New(cfg, commit, ctx.ResolvePath("logs")), nil
+	err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) {
+		var (
+			ethServ *eth.Ethereum
+			lesServ *les.LightEthereum
+		)
+		_ = ctx.Service(&ethServ)
+		_ = ctx.Service(&lesServ)
+		return dashboard.New(cfg, ethServ, lesServ, commit, ctx.ResolvePath("logs")), nil
 	})
+	if err != nil {
+		Fatalf("Failed to register the dashboard service: %v", err)
+	}
 }
 
 // RegisterShhService configures Whisper and adds it to the given node.

dashboard/assets/components/Dashboard.jsx

@@ -83,8 +83,8 @@ const appender = <T>(limit: number, mapper = replacer) => (update: Array<T>, pre
 // the execution of unnecessary operations (e.g. copy of the log array).
 const defaultContent: () => Content = () => ({
 	general: {
-		version: null,
-		commit:  null,
+		version:  null,
+		commit:   null,
 	},
 	home:    {},
 	chain:   {},
@@ -119,8 +119,8 @@ const defaultContent: () => Content = () => ({
 // TODO (kurkomisi): Define a tricky type which embraces the content and the updaters.
 const updaters = {
 	general: {
-		version: replacer,
-		commit:  replacer,
+		version:  replacer,
+		commit:   replacer,
 	},
 	home:    null,
 	chain:   null,

dashboard/assets/components/Header.jsx

@@ -54,7 +54,7 @@ const themeStyles = (theme: Object) => ({
 });
 
 export type Props = {
-	classes: Object, // injected by withStyles()
+	classes:       Object, // injected by withStyles()
 	switchSideBar: () => void,
 };