Commit Graph

8027 Commits

Author SHA1 Message Date
Samer Falah 254b517c6b
Merge pull request #503 from jpmorganchase/chainId_compat
chainId compatibility check failure
2018-08-23 14:58:38 -04:00
jpmsam 37956d8039 return chainId on genesis chainId compatibility check failure 2018-08-23 14:55:10 -04:00
Sai V 8a25cada96 EIP 155 Activation (#502)
Add ChainId validation, add a default networkId and reject network ID 1 for Quorum.
2018-08-23 14:51:13 -04:00
libby kent 64ce540f5d Properly close connection to Constellation to prevent panic (#491) 2018-08-22 09:32:59 -04:00
fixanoid 7976e7eb94
Adding Apache Camel 2018-08-22 09:22:07 -04:00
Peter Fox 7821208a5c
Merge pull request #1 from jpmorganchase/master
Merge from upstream
2018-08-16 15:20:55 +01:00
Peter Fox 159d813f35 Transaction signer mismatch fix (#463)
Always use the EIP155 signer for verifying new transactions being added
to the transaction pool and only skip protected public transactions from replay attacks until
we reach EIP155 activation.
2018-08-08 21:30:53 -04:00
fixanoid 43424382f2
Updating slack refs 2018-08-03 12:03:46 -04:00
apratt3377 f593667dde Allow for optional disablement of privacy config (#462)
Added through a PRIVACY_CONFIG-ignore keyword, as described in #300
2018-08-03 09:51:50 -04:00
Samer Falah 58f291f8ff Reject transactions with not enough gas from being sent (#443)
Fixes #309
2018-08-01 11:13:29 -04:00
Peter Fox 228a7d93d6 Istanbul events not firing & logs not showing on some nodes (#460)
* keep merging of public and private receipts inline with other processing flows
* added private state prepare in commitTransaction for missed private events
2018-08-01 10:06:47 -04:00
Joel Burget 5765a6a331 Make sure to update speculative chain head in `accept.` Fixes #428
The scenario is covered in https://github.com/jpmorganchase/quorum/issues/428, but in short, if
we're mining but two new blocks come in over the network:

(1) The first will clear the speculative chain.
(2) The second previously would have been a noop here --
    `removeProposedTxes` does nothing in this case, but we need to update
    the speculative chain head to the new block.

The important invariant identified by @guojian1234 that this now
maintains is
`minter.speculativeChain.head.blockNumber >= minter.chain.head.blockNumber`.
2018-07-30 09:58:00 -04:00
Sai V ad7c031e85 eth - Storage root retrieval for accounts (#436)
re-enabling eth_storagRoot call
2018-07-27 08:37:29 -04:00
Satpal e8f0ee9162 Prevent private transaction with ether value from becoming stuck in pending (#451) 2018-07-23 15:34:36 +01:00
Samer Falah 88ca46dd7c
Merge pull request #321 from fgimenez/fix-raft-doc-tx
Fix block ids in raft doc
2018-07-14 23:04:21 -04:00
Samer Falah 38247083f3
Merge pull request #390 from tsuzukit/feature/fix_blockchain_test
Fix TestChainTxReorgs
2018-07-12 23:33:22 -04:00
Nguyen Kien Trung d71daf3245 expose leader enode id to console (#426)
* exposed leader enode id to console
2018-07-12 00:44:32 -04:00
Samer Falah 01195280b4 Fixes value transfer (#430) 2018-07-05 13:59:33 -04:00
Qvintvs 87d7c906e9 Use eip155 signer for public transactions (#375)
Use eip155 for public transaction
2018-06-29 16:17:32 -04:00
Samer Falah f3d1315269 Fixes eth.hashrate panic #393 (#409) 2018-06-13 16:48:16 -04:00
fixanoid 31598781f4
quorum-maker master link 2018-06-13 14:53:54 -04:00
Samer Falah 4f50e86827
Merge pull request #399 from jpmorganchase/private_state
validate input before calling evm
2018-06-11 14:12:52 -04:00
jpmsam 7608c1c9b8 validate input before calling evm 2018-06-07 15:45:24 -04:00
Tomoaki Tsuzuki 52f137c850 Feature/fix_some_tests (#387)
* same fix as ethereum/go-ethereum#15783
* Fix insufficient balance for transfer
* change chainId of QuorumTestChainConfig
2018-06-04 16:02:09 -04:00
tsuzukit 1b7a3d9710 Fix TestChainTxReorgs 2018-05-31 21:39:51 +09:00
Samer Falah fd0e3b9d13
Merge pull request #382 from SatpalSandhu61/master
Correction to README to add missing v value for private transactions
2018-05-26 02:27:50 -04:00
SatpalSandhu61 753e8c7b33 Correction to README to add missing value for private transactions 2018-05-24 12:45:39 +01:00
Samer Falah 4a77480371
Merge pull request #354 from tsuzukit/feature/fix-some-tests
Fix TestUpdatedKeyfileContents, TestEIP155SigningVitalik and TestChainId
2018-05-23 11:29:22 -04:00
Samer Falah b6cee6dd83
Merge pull request #350 from tsuzukit/feature/eip155
Use EIP155 signer when needed
2018-05-23 11:25:26 -04:00
fixanoid d4a1b09581
Adding --maxpeers flag info 2018-05-01 15:11:42 -04:00
tsuzukit 9b488857e4 fix TestEIP155SigningVitalik and TestChainId 2018-04-24 20:21:31 +09:00
Martin Holst Swende c8b5da70df accounts/keystore: Ignore initial trigger of rescan-event 2018-04-24 12:14:08 +09:00
Péter Szilágyi c86c12696d accounts/keystore: lock file cache during scan, minor polish 2018-04-24 12:10:03 +09:00
tsuzukit 8bc31e1968 Use EIP155 signer when needed 2018-04-23 11:06:23 +09:00
Samer Falah aa163f0367
Merge pull request #318 from jimthematrix/disable-ethash
Disable ethash by replacing with ethash.NewFullFake
2018-04-19 15:05:55 -04:00
Jim Zhang 51274bd368 reformatted with 'gofmt' 2018-04-19 15:02:05 -04:00
Jim Zhang c535103027 Addressing Sam's comment in the PR: make the FullFake engine the default so other test/fake flavors can still be used 2018-04-18 17:49:31 -04:00
jpmsam d78cd97995 increased the minimum gas limit for the network 2018-04-09 23:25:53 -04:00
Federico Gimenez 5e8494707b Fix block ids in raft doc 2018-03-24 18:54:33 +01:00
Jim Zhang 2e19f7905d Disable ethash by replacing with ethash.NewFullFake 2018-03-18 22:48:07 -04:00
Patrick Mylund Nielsen df4267a256
Merge pull request #303 from stevenroose/build-quorum
Fix build with Go 1.10
2018-03-01 10:23:30 -05:00
Steven Roose 31ffdb3b0e Fix building with Go 1.10 2018-03-01 09:51:46 +01:00
Péter Szilágyi 4d2a48d817 build: fix version comparison for go1.10 and beyond (#15781) 2018-03-01 09:51:18 +01:00
Patrick Mylund Nielsen bfa1e921ce cmd/geth: Remove unused strings import 2018-02-28 10:27:46 -05:00
Patrick Mylund Nielsen bbc8e726e5
Merge pull request #270 from getamis/feature/update_istanbul
consensus, core, eth, miner, params: update istanbul engine
2018-02-27 20:57:21 -05:00
Patrick Mylund Nielsen 362ecfe528
Merge pull request #297 from getamis/consensus_failed
In this PR, we fixed https://github.com/jpmorganchase/quorum/issues/289.
The root cause is we change the block header timestamp in Seal(). It will cause different root hash in proposer and validators' side.

We did the following updates:
1. remove `BlockPauseTime`
2. set block header timestamp in Prepare()
2018-02-27 15:30:43 -05:00
Patrick Mylund Nielsen 5e98b83daa
Merge pull request #298 from conor10/patch-1
README.md: Added Quorum Blockchain Explorer
2018-02-27 08:48:42 -05:00
Conor Svensson 46b9076352
Added Quorum Blockchain Explorer
Tooling list is now ordered alphabetically (with tools in Quorum in their title taking priority).
2018-02-27 08:42:20 +00:00
mark.lin 51c5e2cb30 consensus/istanbul: set header timestamp in Prepare() 2018-02-27 14:52:13 +08:00
mark.lin f7b063302d cmd, consensus: remove BlockPauseTime flag 2018-02-27 14:52:03 +08:00