quorum

Author	SHA1	Message	Date
Jitendra Bhurat	6d8c7ed226	Checking if c.current is nil, as it can be when istanbul engine is stopped due to block download event	2019-04-23 17:13:30 -04:00
Trung Nguyen	85d3c4d031	merged from upstream/master	2018-12-11 10:43:48 -05:00
Trung Nguyen	f09bd2c465	fixed the logic to verify if block is currently proposed	2018-10-15 12:31:17 -04:00
Trung Nguyen	478139017d	fix racing condition when proposer receives same block from peer	2018-10-05 16:09:10 -04:00
amalraj.manigmail.com	72270b10c7	Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.12 # Conflicts: # .travis.yml # README.md # cmd/geth/genesis_test.go # core/genesis.go # core/genesis_test.go # core/state_processor.go # eth/config.go # eth/downloader/downloader_test.go # eth/protocol_test.go # params/config.go	2018-09-27 18:55:55 +08:00
Trung Nguyen	7af7d8cfef	avoid growing backlogs when valSet changes	2018-09-05 17:22:42 -04:00
Qvintvs	622e98ad51	debug merge attempt	2018-05-31 14:21:16 +08:00
mark.lin	9ac24f9aaa	consensus, core, eth, miner, params: update istanbul engine	2018-01-31 10:27:08 +08:00
Patrick Mylund Nielsen	3d91976f08	Geth 1.7.2 rebase and addition of Istanbul BFT (#207 )	2017-10-31 18:24:11 -04:00