Commit Graph

10162 Commits

Author SHA1 Message Date
amalraj.manigmail.com 46cf4ddfb6 add apis for org key management 2018-10-30 15:59:08 +08:00
amalraj.manigmail.com 1f2504ff08 add all APIs related to node permission 2018-10-30 15:05:41 +08:00
amalraj.manigmail.com 64d8db5678 add api implementation for permission node - propose node 2018-10-30 10:41:01 +08:00
amalraj.manigmail.com 299c17598a add api stubs for permission node 2018-10-29 12:23:53 +08:00
amalraj.manigmail.com 63a38ae054 Merge remote-tracking branch 'remotes/saiv/1812MergePerm' into 1812-permission-rpc-api 2018-10-26 13:39:46 +08:00
vsmk98 10c926ab75 Removed dependency on permissioned-nodes.json. 2018-10-26 05:38:56 +00:00
amalraj.manigmail.com 20b137bfb1 Merge remote-tracking branch 'remotes/saiv/1812MergePerm' into 1812-permission-rpc-api 2018-10-26 12:34:51 +08:00
amalraj.manigmail.com b24e51de1b add api stubs for permission node 2018-10-26 12:33:23 +08:00
vsmk98 c37530e7d1 Merge branch 'privateAbigen' of https://github.com/vsmk98/quorum into 1812MergePerm 2018-10-25 02:22:42 +00:00
Sai V c60ba9cb21
Merge pull request #6 from zzy96/privateAbigen
private abigen merged
2018-10-25 10:19:52 +08:00
vsmk98 5187dd9430 Code changes for populating the initial node list from static-nodes.json 2018-10-24 10:21:21 +00:00
zzy96 d11276fbc1 private abigen merged 2018-10-24 16:44:59 +08:00
vsmk98 4dc1f3376b Corrected enode format for Raft 2018-10-23 15:00:57 +00:00
vsmk98 6ee681156a Merge branch '1812MergePerm' of https://github.com/vsmk98/quorum into 1812MergePerm local branch behind 2018-10-23 14:59:09 +00:00
vsmk98 10ad4a5364 Corrected enode format for Raft 2018-10-23 14:58:39 +00:00
vsmk98 f935a0ce8f Merge branch '1812MergePerm' of https://github.com/vsmk98/quorum into 1812MergePerm
Merge of local branch with remote
2018-10-23 10:41:53 +08:00
vsmk98 501f798b6f cherry pick ff2d4d2cedc09db23cc46d3eeb8b402bca6d819d for package rjeczalik 2018-10-23 10:40:34 +08:00
vsmk98 519348e621 Cherry pick pvt abigen. Make errors exist 2018-10-23 10:21:57 +08:00
amalraj.manigmail.com 0605e4db37 Merge remote-tracking branch 'remotes/origin/master' into 1812MergePerm 2018-10-17 11:50:32 +08:00
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 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