Krish1979
a8f75f521e
Rename docs/README.md to docs/test/README.md
2019-04-23 09:50:53 +01:00
Jitendra Bhurat
9dbafd38c5
Adding a lock around WriteBlockWithState while processing sealing result
2019-04-16 15:23:42 -04:00
amalraj.manigmail.com
62c00b637c
permission: set default gas ceil and floor to 700M which is the default minGasLimit
2019-04-16 18:05:29 +08:00
chris-j-h
6a4c751a13
Add encrypted tx payload hash from TM to Quorum tx's data field
...
The TM response was being stored in an isolated scope variable,
therefore the tx data was not being updated correctly for private txs.
This meant the private tx payload could not be retrieved from the TM
when needed.
2019-04-05 10:52:48 +01:00
amalraj.manigmail.com
efd39f1b6a
raft: pass gas floor and gas ceil to calcGasLimit when minting block
2019-04-05 17:13:10 +08:00
jpmsam
2d22fd0044
version update
2019-04-04 16:45:40 -04:00
Samer Falah
697791f6fa
Merge pull request #675 from jbhurat/defaulting_tx_size_limit
...
Reading default transaction size limit, if it is 0
2019-04-04 14:43:32 -04:00
Jitendra Bhurat
c429b00caa
Reading default transaction size limit, if it is 0
2019-04-04 10:58:44 -04:00
jpmsam
17f558dae9
version update
2019-04-03 11:22:12 -04:00
Samer Falah
a5021ac812
Merge pull request #667 from kaleido-io/raft-fix-master
...
Check recovered sender address before including txs in the TransactionsByPriceAndNonce list
2019-04-03 10:54:19 -04:00
Samer Falah
e9ce8d4668
Merge pull request #656 from jbhurat/raft-panic-adding-peer
...
Adding a node only if it is not in the raft peer list
2019-03-29 14:19:39 -04:00
Jim Zhang
a0c5a63e51
Added an Info log when skipping incorrectly signed txs; cleaned up debug logging
2019-03-28 12:17:16 -04:00
Jim Zhang
ff94ad50a0
Check for Sender() return errors before using the resolved sender address, to account for sending EIP155 externally signed txs before the EIP155 block
2019-03-28 12:01:29 -04:00
Samer Falah
d715db38c4
Merge pull request #639 from QuorumEngineering/AJ-geth-upgrade-1.8.18
...
geth upgrade 1.8.18
2019-03-19 16:22:07 -04:00
amalraj.manigmail.com
b286409b7a
merge with quorum upstream
...
params: config.go and denomination.go merged with conflicts
2019-03-18 11:43:03 +08:00
amalraj.manigmail.com
849eca21da
merge with quorum upstream
...
params: config.go and denomination.go merged with conflicts
2019-03-18 11:34:09 +08:00
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