Commit Graph

10295 Commits

Author SHA1 Message Date
jpmsam 0d0c507a59 Quorum version update 2018-10-16 16:56:55 -04:00
vsmk98 d6352b30c3 Merge of 1812 with permissions changes and fix of conflicts 2018-10-12 04:24:36 +00:00
vsmk98 e679587e1f Fix vendor package error in Mojave 2018-10-12 12:23:13 +08:00
vsmk98 e3dddcafaa Reverted to 1.10 version of go for docker
changed author name
2018-10-12 10:32:30 +08:00
Sai Valiveti c1fbb5143a Merge branch 'geth-upgrade-1.8.12' of https://github.com/vsmk98/quorum into geth-upgrade-1.8.12
eth stat changes
2018-10-12 10:23:30 +08:00
amalraj.manigmail.com 46472a2b64 ethstats: pass engine protocol name for quorum 2018-10-12 00:43:30 +08:00
Sai Valiveti c73c1ff592 Reverted to go version 1.9 in Dockerfile 2018-10-11 15:49:51 +08:00
amalraj.manigmail.com c0373acd72 keep only linux and mac OS build configs in travis 2018-10-10 14:04:45 +08:00
amalraj.manigmail.com b24daed8af remove swarm/network/simulations/discovery TestDiscoverySimulationDockerAdapter go test as it is failing in go-ethereum 1.8.12 up-stream 2018-10-10 12:34:11 +08:00
amalraj.manigmail.com 662ee40ede fix go test cases 2018-10-10 11:28:19 +08:00
amalraj.manigmail.com 8f51fb3e00 remove failing ethash test case as its not supported by quorum 2018-10-10 11:27:51 +08:00
amalraj.manigmail.com fcfc7b6d45 merge with quorum upstream master 2018-10-09 16:01:11 +08:00
Samer Falah 4d015bb488
Merge pull request #541
Update signing issue for eth_sendTransactionAsync RPC call
2018-10-08 16:29:51 -04:00
vsmk98 8c2a8ab32a reverted some changes 2018-10-08 06:29:11 +00:00
Péter Szilágyi 1ed50aa4e3 trie: handle removing the freshest node too 2018-10-08 03:48:01 +00:00
Peter Fox 7a282ff433 Inline example data 2018-10-05 20:20:18 +01:00
fixanoid 581eed5a0f
Adding docker hub link 2018-10-05 11:39:41 -04:00
vsmk98 d20b42b6a6 test changes 2018-10-05 08:31:09 +00:00
vsmk98 c245bf5c8a reverting changes 2018-10-05 08:20:21 +00:00
Sai Valiveti 9ab2f224d9 Node crash issue fix 2018-10-05 14:59:20 +08:00
vsmk98 4d31d85ff8 comments added to contract 2018-10-04 03:03:22 +00: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
vsmk98 ef1708fbc0 contract change and abigen for updated binding 2018-10-03 15:22:28 +00:00
vsmk98 f5f433e4c7 Majority voting logic added 2018-10-03 10:03:51 +00:00
Peter Fox 37fdc6b2a4 Update field name 2018-10-03 11:02:52 +01:00
Peter Fox d8f3fcad81 Add more eth_sendTransactionAsync examples 2018-10-03 10:37:46 +01:00
vsmk98 b806571e9f Contract logic change for voting 2018-10-03 06:48:20 +00:00
vsmk98 e41fd1c194 Adding voter logic to the contract 2018-10-03 01:14:31 +00:00
Peter Fox f0b629bed8 Updated eth_sendTransactionAsync example 2018-10-02 22:21:14 +01:00
Poh Zi How 05f6cf9bb2 look up IP if host is FQDN (#544)
Fixes #147
2018-10-02 16:38:20 -04:00
vsmk98 f9a6f1fbb2 code changed for key delete scenario 2018-10-02 08:28:55 +00:00
Jitendra Bhurat 2ad2e0b4bf Added a validateConsensus() which exits geth if no consensus is speci… (#540)
Validate for a Quorum supported consensus and exit if no consensus is specified.
2018-10-01 16:39:01 -04:00
Nguyen Kien Trung 40f7d2b8b4 Value Transfer in Private Transactions (#538)
Fix #528
2018-10-01 14:37:05 -04:00
Peter Fox 87e852ed0d Updated API docs from comments 2018-10-01 13:42:08 +01:00
Peter Fox 2474f53efd Add API docs 2018-10-01 12:16:31 +01:00
vsmk98 771a561887 Contract logic updated, name changed 2018-10-01 10:44:06 +00:00
Peter Fox c3f565db34 Updated import order 2018-10-01 10:09:14 +01:00
Peter Fox 5944ff2346 Added back the async throttling, fixing an issue where it could block
when the channel is full. Now it returns immediately with an error
indicating the channel is overloaded.
2018-10-01 10:07:50 +01:00
vsmk98 8e21004b6b removed import of sync 2018-09-28 08:19:57 +00:00
vsmk98 a574bc4026 code refactor for managing cluster key 2018-09-28 08:15:59 +00:00
amalraj.manigmail.com d35f6e2c5e Merge remote-tracking branch 'remotes/peter/bugfix/sendTransactionAsync-updates' into geth-upgrade-1.8.12
# Conflicts:
#	internal/ethapi/api.go
2018-09-28 15:51:27 +08:00
amalraj.manigmail.com f82809d9a2 backend: fix chainId to chainID after merge 2018-09-27 23:23:10 +08:00
vsmk98 7dcd66a543 Cluster key related changes 2018-09-27 11:24:38 +00: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
vsmk98 8d3f8bb3d5 Raft: private state tridb commit added 2018-09-27 07:30:00 +00:00
vsmk98 912809810a added Raft BoundedFullSync functions which were overwritten as a part upstream merge 2018-09-27 07:27:37 +00:00
vsmk98 b11c0f5ba7 Removed unnecessary files 2018-09-27 03:16:17 +00:00
Peter Fox 073f73b778 Merge branch 'master' of https://github.com/jpmorganchase/quorum into bugfix/sendTransactionAsync-updates 2018-09-24 13:49:50 +01:00
Brian Schroeder 8c9ed51fa0 Disallow p2p or raft port reuse for raft consensus (#524) 2018-09-21 11:57:26 -04:00
Nguyen Kien Trung 6c9ec6b1d9 added travis status (#535) 2018-09-20 15:18:14 -04:00