9 Commits

Author	SHA1	Message	Date
amalraj.manigmail.com	fcfc7b6d45	merge with quorum upstream master	2018-10-09 16:01:11 +08:00
dbryan0516	db8cc814fe	Raft Block Signature (#395) ... Added block signature to raft in the header.Extra field	2018-10-03 20:14:48 -04:00
amalraj.manigmail.com	7c548e0f74	Merge remote-tracking branch 'remotes/geth/release/1.8' into merge-193 ... changes related to merge conflicts	2018-07-24 16:15:38 +08:00
Qvintvs	622e98ad51	debug merge attempt	2018-05-31 14:21:16 +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
Brian Schroeder	b89d59f9c7	Always use InsertChain to extend the chain ... This fixes posting of logs on the minter.	2017-03-31 10:02:42 -04:00
Brian Schroeder	0d4d5b9555	Remove posting of ChainEvent during minting ... ChainEvent should instead be posted when we extend the chain.	2017-03-31 10:02:42 -04:00
Joel Burget	82a140abbb	Documentation tweaks. (#80) ... Documentation updates and gofmt raft.	2017-03-23 14:23:51 -05:00
Joel Burget	b6286320ef	Add Raft-based consensus (#79) ... This was implemented by Joel Burget (@joelburget) and Brian Schroeder (@bts).	2017-03-23 13:41:02 -05:00