16 commits

Author	SHA1	Message	Date
Christopher Franko	a85150f0b4	upstream merge continued	2017-03-26 12:08:39 -04:00
Christopher Franko	5822644626	Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.5.9	2017-03-26 11:40:56 -04:00
Péter Szilágyi	bb7dca275c	ethstats: cleanups, trace logs and "fix" history responses (#3812)	2017-03-24 10:42:40 +01:00
Péter Szilágyi	2ba9374789	ethstats: try both ws:// and wss:// if none specified	2017-03-20 12:45:43 +02:00
Péter Szilágyi	e7030c4bf5	all: update light logs (and a few others) to the new model	2017-03-03 11:41:52 +02:00
Péter Szilágyi	d4fd06c3dc	all: blidly swap out glog to our log15, logs need rework	2017-02-23 12:16:44 +02:00
Christopher Franko	9582754492	readding eth/exp cross compatibility	2017-02-15 14:16:12 -05:00
Christopher Franko	57638f70e6	Merge https://github.com/ethereum/go-ethereum into rebase-1.5.9	2017-02-15 13:21:31 -05:00
Felix Lange	f2da6581ba	all: fix issues reported by honnef.co/go/simple/cmd/gosimple	2017-01-06 18:18:07 +01:00
Felix Lange	35a7dcb162	all: gofmt -w -s	2017-01-06 15:52:03 +01:00
Péter Szilágyi	b2c226cb7d	ethstats: implement block history retrievals	2016-12-12 14:01:52 +02:00
Péter Szilágyi	13614f4e1c	ethstats: fix timestamps and add custom proto support	2016-12-11 20:16:30 +02:00
Bas van Kervel	56b446190a	ethstats: check if received event is valid	2016-11-30 17:47:39 +01:00
Péter Szilágyi	7dfeceb8cc	ethstats: don't drop concurrent head reports (mini forks)	2016-11-29 14:17:20 +02:00
Péter Szilágyi	7625b1a4f4	ethstats: report block miner, gas limit and gas consumption	2016-11-29 11:39:56 +02:00
Péter Szilágyi	4c8c5e2f74	cmd, ethstats, les, mobile, params: native netstats (#3336)	2016-11-25 16:55:06 +01:00