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

10995 Commits

Author SHA1 Message Date
amalraj.manigmail.com 6fb33c0e32 Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18 2019-02-13 17:26:38 +08:00
vsmk98 b0cd2b5ef2 updated code comments 2019-02-13 12:31:11 +08:00
vsmk98 0b6e64f250 changes to ensure that unlock is called only after lock 2019-02-13 09:57:11 +08:00
vsmk98 05b17e3ab4 removed debug log statements 2019-02-13 09:51:22 +08:00
Samer Falah 212b25c566
Merge pull request #539 from jbhurat/impossible-reorg-fix-v1 
consensus/istanbul: Race condition causing "Impossible reorg" error
 2019-02-12 18:51:25 -05:00
Jitendra Bhurat 1ddf595c34 Using NewBlockMsg constant instead of hardcoded 0x07 2019-02-12 15:36:05 -05:00
Samer Falah 07c76cc137
Merge pull request #595 from SatpalSandhu61/fix-for-bad-block-on-gas-limit 
Fix for BAD BLOCK caused by "gas limit reached" for private contracts
 2019-02-12 10:40:35 -05:00
amalraj.manigmail.com a8f7b2ca33 update newly added methods 2019-02-12 22:08:42 +08:00
vsmk98 6ef3b82a2b changes to contract based on review comments 2019-02-12 20:24:31 +08:00
vsmk98 4fe308c10a changes to contract based on code review comments 2019-02-12 18:00:39 +08:00
vsmk98 5be95b6403 updated to documentation 2019-02-12 16:27:15 +08:00
vsmk98 f83b100052 refactored contract to remove all for loops 2019-02-12 16:22:15 +08:00
vsmk98 9b8906664c Removed for loops for master org and voter list update 2019-02-12 11:11:39 +08:00
vsmk98 13bccaa9c6 code changes to fix review comments 2019-02-12 09:54:13 +08:00
vsmk98 81467d1aa2 correcting typos 2019-02-11 09:57:18 +08:00
amalraj.manigmail.com 7b2e2777ae fix unit test 2019-02-10 20:54:25 +08:00
amalraj.manigmail.com 5f7042a383 fix merge conflict 2019-02-10 20:36:32 +08:00
amalraj.manigmail.com c2b98220eb Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18-latest 
# Conflicts:
#	.travis.yml
#	cmd/geth/consolecmd_test.go
#	vendor/github.com/rjeczalik/notify/watcher_readdcw.go
#	vendor/golang.org/x/sys/cpu/cpu.go
#	vendor/golang.org/x/sys/cpu/cpu_arm.go
#	vendor/golang.org/x/sys/cpu/cpu_arm64.go
#	vendor/golang.org/x/sys/cpu/cpu_mips64x.go
#	vendor/golang.org/x/sys/cpu/cpu_mipsx.go
#	vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
#	vendor/golang.org/x/sys/cpu/cpu_s390x.go
#	vendor/vendor.json
 2019-02-10 20:31:51 +08: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
vsmk98 daedb2be43 documentation update for org key management 2019-02-08 17:17:21 +08:00
vsmk98 8673598d3b added check to allo only an account with full access rights can add voter at master org level 2019-02-08 16:29:27 +08:00
vsmk98 eaab3b004e Added check to ensure that at least one account with Full access will be there in the network 2019-02-08 14:25:35 +08:00
vsmk98 b9478cae14 update to documentation 2019-02-07 22:31:03 +08:00
vsmk98 7bf23acb06 update of documentation for permissioning 2019-02-07 18:00:31 +08:00
vsmk98 1d4dc4016e update of documentation for permissioning 2019-02-07 16:46:24 +08:00
vsmk98 19700575df update of documentation for permissioning 2019-02-07 15:59:15 +08:00
vsmk98 5e03b96f68 update of documentation for permissioning 2019-02-07 15:50:57 +08:00
vsmk98 b6616a5ca4 added error messages for invalid ops 2019-02-07 15:19:25 +08:00
vsmk98 680dd3cd7f modified the error message 2019-02-07 14:35:22 +08:00
vsmk98 1f527f7b3b Added check to ensure that at least one account is given as a part of genesis.json for initial network to come up 2019-02-07 14:31:19 +08:00
vsmk98 178d7629c4 added error message when a node not part of network is added is proposed for deactviation 2019-02-07 12:45:29 +08:00
vsmk98 c0d48d90d4 changed API names as per review and testing 2019-02-07 09:20:49 +08:00
Samer Falah bb0261036b
Merge pull request #619 from drequinox/master 
Fixes for Go 11
 2019-02-05 12:21:01 -05:00
Jitendra Bhurat 65c89d5409
Merge branch 'master' into master 2019-02-05 11:23:45 -05:00
Samer Falah b5920e005c
Merge pull request #616 from jpmorganchase/quorum-node-info 
Adding Quorum version into node info
 2019-02-04 12:00:52 -05:00
Samer Falah 70e07d6e10
Merge pull request #621 from QuorumEngineering/raft-sync-greater-height 
Raft: process sync data in parallel to download
 2019-02-04 11:35:58 -05:00
vsmk98 f41e7ac83c additional fixes 2019-02-01 16:08:48 +08:00
vsmk98 13b8209d18 bug fixes based on internal testsing 2019-02-01 15:32:45 +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
amalraj.manigmail.com bc529a509d 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:14 +08:00
vsmk98 925dd698e6 changes to reorder account access types 2019-01-29 14:23:30 +08:00
vsmk98 1cee5af40d merge with Zhiyao branch for cancel pending operation 2019-01-29 14:06:24 +08:00
vsmk98 70b66fb808 changes for solc compire change 0.5.3 version 2019-01-29 13:52:58 +08:00
amalraj.manigmail.com 8e30fc202a Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18 
# Conflicts:
#	consensus/ethash/consensus.go
#	eth/bloombits.go
#	params/protocol_params.go
 2019-01-25 22:29:22 +08:00
amalraj.manigmail.com 2914b3c99d Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18 
# Conflicts:
#	consensus/ethash/consensus.go
#	eth/bloombits.go
#	params/protocol_params.go
 2019-01-25 22:24:03 +08:00
zzy96 e854ebaabe add cancelPendingOperation api in quorumNodeMgmt 2019-01-24 14:25:44 +08:00
vsmk98 412ba4d73d changes to avoid duplicate records in permissioned-nodes.json 2019-01-24 13:35:46 +08:00
Samer Falah e8458c028d
Merge pull request #618 from SatpalSandhu61/print-vm-failure-reason-to-log 
Print vm failure reason to log
 2019-01-23 15:11:42 -05:00
Nguyen Kien Trung be5f333767 Binaries distribution to Bintray (#623) 
distribute binaries to bintray when tagging
 2019-01-23 15:10:09 -05:00
vsmk98 4bb8a364a9 added check in init function to avoid duplicate entries 2019-01-23 08:55:50 +08:00