poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,202 Commits 22 Branches 24 Tags 156 MiB
Commit Graph

28 Commits

Author SHA1 Message Date
vsmk98 d6352b30c3 Merge of 1812 with permissions changes and fix of conflicts 2018-10-12 04:24:36 +00:00
amalraj.manigmail.com 662ee40ede fix go test cases 2018-10-10 11:28:19 +08:00
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 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
Brian Schroeder 8c9ed51fa0 Disallow p2p or raft port reuse for raft consensus (#524) 2018-09-21 11:57:26 -04:00
vsmk98 02e4344b4b changes to disconnect peer upon blacklisting 2018-09-19 06:55:41 +00:00
apratt3377 0af7ad0664 Feature/410/expose raft cluster api (#501) 
* Added an endpoint to expose raft cluster details
 2018-09-11 15:05:42 -04:00
amalraj.manigmail.com e6773756fb merge 1.8.12 with upstream/master to apply the fixes/changes added newly 2018-08-06 19:03:51 +08:00
Joel Burget 5765a6a331 Make sure to update speculative chain head in `accept.` Fixes #428 
The scenario is covered in https://github.com/jpmorganchase/quorum/issues/428, but in short, if
we're mining but two new blocks come in over the network:

(1) The first will clear the speculative chain.
(2) The second previously would have been a noop here --
    `removeProposedTxes` does nothing in this case, but we need to update
    the speculative chain head to the new block.

The important invariant identified by @guojian1234 that this now
maintains is
`minter.speculativeChain.head.blockNumber >= minter.chain.head.blockNumber`.
 2018-07-30 09:58:00 -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
Samer Falah 88ca46dd7c
Merge pull request #321 from fgimenez/fix-raft-doc-tx 
Fix block ids in raft doc
 2018-07-14 23:04:21 -04:00
Nguyen Kien Trung d71daf3245 expose leader enode id to console (#426) 
* exposed leader enode id to console
 2018-07-12 00:44:32 -04:00
Qvintvs 622e98ad51 debug merge attempt 2018-05-31 14:21:16 +08:00
fixanoid d4a1b09581
Adding --maxpeers flag info 2018-05-01 15:11:42 -04:00
Federico Gimenez 5e8494707b Fix block ids in raft doc 2018-03-24 18:54:33 +01:00
Joel Burget d21f5e5284 Add missing argument to checkpoint. 2018-02-02 13:45:40 -05:00
Patrick Mylund Nielsen 3d91976f08
Geth 1.7.2 rebase and addition of Istanbul BFT (#207) 2017-10-31 18:24:11 -04:00
Coenie Beyers e806e7f57e Adding information regarding enode order in static-nodes.json (#174) 2017-09-15 13:28:36 -04:00
Brian Schroeder 5dfdecef4c Dynamic raft membership support (#130) 2017-08-28 17:43:44 -04:00
S. Matthew English 60c992e916 Update doc.md 2017-06-09 11:05:55 +02:00
s.matthew.english b0aaf68e31 Add extension to README files render markdown, readability improvemewnts to core/quorum/ 
Remove unused TestBlockVotingBlockMaker function

Readability improvments to comments for core/quorum/ and raft/

Readability improvments to raft/speculative_chain.go

Readability improvments to docs/
 2017-06-09 10:59:09 +02:00
Joel Burget 852ac74467 Raft updates (#104) 
* Move raft checkpoint logging to logger package.

This allows us to use it everywhere and turn it on / off from command
flags.

* Return an error when the pending block is requested in Raft mode.
 2017-05-04 16:49:48 -04:00
Brian Schroeder d442011414 Remove notion of detached blocks from raft docs 2017-04-10 11:55:55 -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