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

20 Commits

Author SHA1 Message Date
amalraj.manigmail.com a8c050df22 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.12' into feature/permissioning-1.8.18 
# Conflicts:
#	cmd/bootnode/main.go
#	internal/web3ext/web3ext.go
#	p2p/discover/udp.go
#	p2p/discover/udp_test.go
#	p2p/permissions.go
#	p2p/server.go

poc to pass permission contract via command line
 2019-03-08 17:09:24 +08:00
amalraj.manigmail.com d5e4ae7b87 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.12' into feature/permissioning-1.8.18 
# Conflicts:
#	cmd/bootnode/main.go
#	internal/web3ext/web3ext.go
#	p2p/discover/udp.go
#	p2p/discover/udp_test.go
#	p2p/permissions.go
#	p2p/server.go
 2019-03-08 12:53:46 +08:00
amalraj.manigmail.com 2fd6876827 Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18 2019-03-07 15:02:05 +08:00
amalraj.manigmail.com 32729b9f28 remove TODO related to review 2019-02-25 16:30:54 +08:00
amalraj.manigmail.com 6bdd01fc0b raft: change RAFTPORT to RaftPort 2019-02-25 15:01:53 +08:00
chris-j-h bfa7dcfbc3 Raft doc and log message updates 2019-02-15 16:36:11 +00:00
amalraj.manigmail.com 73667e7942 merge 1.8.18 with quorum/master 
refactor raft & istanbul based on upstream changes
fix unit test cases
 2019-02-08 17:29:01 +08:00
amalraj.manigmail.com 4dbd95947d Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18 
# Conflicts:
#	.github/CONTRIBUTING.md
#	.travis.yml
#	core/blockchain.go
#	core/vm/evm.go
#	core/vm/logger_test.go
#	eth/handler_test.go
#	eth/tracers/tracer_test.go
#	internal/ethapi/api.go
#	internal/web3ext/web3ext.go
#	p2p/discover/node.go
#	p2p/server.go
#	swarm/network/simulations/discovery/discovery_test.go
 2019-01-29 19:08:50 +08:00
vsmk98 d6352b30c3 Merge of 1812 with permissions changes and fix of conflicts 2018-10-12 04:24:36 +00:00
amalraj.manigmail.com 2c4081d89f Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new 
fix compilation issues on programs impcted by this merge
 2018-10-04 16:21:20 +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
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
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 5dfdecef4c Dynamic raft membership support (#130) 2017-08-28 17:43:44 -04: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 b89d59f9c7 Always use InsertChain to extend the chain 
This fixes posting of logs on the minter.
 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