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

10724 Commits

Author SHA1 Message Date
amalraj.manigmail.com e034cb1680 Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18 2019-02-25 14:46:49 +08:00
amalraj 9a3184ba19 travis: run quorum-acceptance-tests for pull requests (#637) 
* update travis to enable running acceptance test for raft, istanbul and clique consensus when a PR is raised
 2019-02-22 16:24:15 -05:00
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
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
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
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
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
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
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
Nguyen Kien Trung a4580fc22e Minor update to README (#622) 
* Added full logo link
* Added download link
 2019-01-16 16:19:44 -05:00
fixanoid c6f0ae4e29 Quorum version bump 2019-01-16 17:28:01 +00:00
Imran Bashir 0b849799ab fixgo11 2019-01-14 15:14:41 +00:00
SatpalSandhu61 895947de48 Currently, we can't tell the reason for evm failure, so change log message for EVM failure reason from Debug to Info. This is helpful to users and makes analysis of issues much easier. 2019-01-10 13:54:38 +08:00
SatpalSandhu61 f69ae6c19a Merge branch 'master' of https://github.com/jpmorganchase/quorum 2019-01-09 12:04:11 +08:00
Felix Shnir db34314a9a Updating test 2019-01-07 17:05:56 +00:00
Felix Shnir 54f9a8ef13 Adding Quorum info into nodeInfo 2019-01-07 15:54:17 +00:00
Samer Falah d77cb778ca
Merge pull request #563 from Puneetha17/private_rawtx 
Do not reset V value if the tx is already set to private
 2019-01-07 09:22:20 -05:00
Peter Fox 126d051943 Added comment to explain the change 2019-01-07 10:00:50 +00:00
Samer Falah c090cea617
Merge pull request #591 from QuorumEngineering/feature/support-private-sendRawTransaction-merge 
feature/support private sendRawTransaction
 2019-01-04 15:18:15 -05:00
namtruong 01a8a5ec80 minor documentation update 2019-01-04 19:32:17 +00:00
namtruong e92052b3a4 return error when sendRawPrivateTransaction is called to submit public transaction (privateFor list empty) 2019-01-03 15:26:42 +00:00
Peter Fox 569719975f Allow processing of sync content whilst it is being downloaded when 
using a bounded sync
 2019-01-03 10:00:07 +00:00
Samer Falah decb4c76b4
Merge pull request #592 from trung/staticcall-dual-state 
added dual state implementation to StaticCall
 2019-01-01 13:59:13 +00:00
Samer Falah 1092eac015
Merge pull request #597 from jpmorganchase/fd-limit-max-out 
Maxing out fdlimit per go-ethereum#18211
 2018-12-13 15:27:59 -05:00
Samer Falah 004dd53a68
Merge pull request #598 from jbhurat/miner-setcoinbase 
Prevent deadlock when miner.setEtherbase is called for Istanbul consensus
 2018-12-13 15:19:45 -05:00
Jitendra Bhurat aea11d53a8 calling unlock using defer, preventing deadlock when miner.setEtherbase() returns an error 2018-12-13 12:31:50 -05:00
Felix Shnir bd558eff27 Cherrypicking go-ethereum#18211 pull 2018-12-13 16:32:48 +00:00
SatpalSandhu61 7deea65847 Merge branch 'master' of https://github.com/jpmorganchase/quorum 2018-12-13 11:50:11 +00:00
jpmsam 8f678278aa quorum version update 2018-12-12 15:27:29 -05:00
Trung Nguyen 67c9b4332f
staticcall does not modify states so no need to push to stack 2018-12-11 16:54:18 -05:00
Samer Falah df03a37833
Merge pull request #585 from jbhurat/estimate-gas 
Fixing high estimate gas issue
 2018-12-11 16:47:37 -05:00
Trung Nguyen 1007ea93e2
fixed unit test 2018-12-11 11:28:26 -05:00
Trung Nguyen 85d3c4d031
merged from upstream/master 2018-12-11 10:43:48 -05:00
SatpalSandhu61 50da8eaf0d Fix for issue 576 where private transactions can cause block gas limit to be exceeded, leading to BAD BLOCK. 2018-12-10 15:30:28 +00:00
SatpalSandhu61 5af110984a Fix for issue 576 where private transactions can cause block gas limit to be exceeded, leading to BAD BLOCK. 2018-12-10 09:58:16 +00:00
Jitendra Bhurat 7803a2f7ef Setting the private state to public state if contract address is not present in the private state 2018-12-06 11:02:12 -05:00
Trung Nguyen 089841e036
added dual state implementation to StaticCall 2018-12-05 13:47:01 -05:00
namtruong c49a833eb9 add support for private sendRawTransaction - merge with latest quorum 2018-12-05 14:30:42 +00:00