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

10849 Commits

Author SHA1 Message Date
Jitendra Bhurat 7eedfd2059 Adding a node only if it is not in the raft peer list 2019-03-15 11:36:41 -04:00
Samer Falah 2735367497
Merge pull request #644 from QuorumEngineering/estimategas-for-privatetransaction 
EstimateGas to handle private transaction gas cost differences
 2019-03-12 14:23:53 -04:00
Samer Falah af38cd133d
Merge pull request #636 from jpmorganchase/txn-size-limit-genesis 
Adding support for transaction size limit via genesis
 2019-03-07 11:28:37 -05:00
amalraj.manigmail.com 57be5ca94e remove comment 2019-03-07 15:15:20 +08:00
amalraj.manigmail.com aaf67bfd75 solc upgrade 2019-03-07 15:03:54 +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
Samer Falah 0a57640e95
Merge pull request #648 from trung/solc-specific-version 
Use solc 0.5.4 when running acceptance tests against pull requests
 2019-03-06 22:49:59 -05:00
Trung Nguyen f6e5aa67f4
grant executable to solc 2019-03-06 15:55:21 -05:00
Trung Nguyen e9f2596e19
use solc 0.5.4 2019-03-06 15:50:24 -05:00
Samer Falah d4ff7f1fdd
Merge pull request #647 from QuorumEngineering/raft-doc-update 
Update Raft doc and log messages
 2019-03-06 15:30:44 -05:00
amalraj.manigmail.com 45fc047ae7 Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18 2019-03-06 12:49:40 +08:00
amalraj.manigmail.com 9d544810f8 update CONTRIBUTING.md with quorum wiki 2019-02-27 14:03:53 +08:00
amalraj.manigmail.com 0af013dd13 merge CONTRIBUTING.md with upstream 2019-02-26 17:43:10 +08:00
amalraj.manigmail.com eb06642fc2 update comments 2019-02-26 16:33:29 +08:00
fixanoid dadd8b0f30
Update BUILDING, adding Windows info 2019-02-25 12:39:46 -05: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
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
Peter Fox e1e5fa0e8f Require the addition of the extra intrinsic gas cost to remain under the 
user input gas limit.
 2019-02-21 17:00:28 +00:00
Peter Fox a872dd10c2 Compare intrinsic gas of public transaction versus the private version 
that contains the PTM hash instead. If there is a difference, add it on
to the execution cost.
 2019-02-21 15:56:35 +00:00
chris-j-h bfa7dcfbc3 Raft doc and log message updates 2019-02-15 16:36:11 +00:00
fixanoid 0f68921124 Renaming to TransactionSizeLimit for clarity 2019-02-14 09:01:22 -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
fixanoid cca2e84c18 Transaction size limit support via genesis 2019-02-12 17:23:59 -05:00
Jitendra Bhurat 1ddf595c34 Using NewBlockMsg constant instead of hardcoded 0x07 2019-02-12 15:36:05 -05:00
fixanoid 918aaa83a9 Merge branch 'txn-size-limit-cli' into txn-size-limit-genesis 2019-02-12 11:45:54 -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