Commit Graph

10071 Commits

Author SHA1 Message Date
Sai Valiveti 9ab2f224d9 Node crash issue fix 2018-10-05 14:59:20 +08:00
vsmk98 8e21004b6b removed import of sync 2018-09-28 08:19:57 +00:00
amalraj.manigmail.com d35f6e2c5e Merge remote-tracking branch 'remotes/peter/bugfix/sendTransactionAsync-updates' into geth-upgrade-1.8.12
# Conflicts:
#	internal/ethapi/api.go
2018-09-28 15:51:27 +08:00
amalraj.manigmail.com f82809d9a2 backend: fix chainId to chainID after merge 2018-09-27 23:23:10 +08:00
amalraj.manigmail.com 72270b10c7 Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.12
# Conflicts:
#	.travis.yml
#	README.md
#	cmd/geth/genesis_test.go
#	core/genesis.go
#	core/genesis_test.go
#	core/state_processor.go
#	eth/config.go
#	eth/downloader/downloader_test.go
#	eth/protocol_test.go
#	params/config.go
2018-09-27 18:55:55 +08:00
vsmk98 8d3f8bb3d5 Raft: private state tridb commit added 2018-09-27 07:30:00 +00:00
vsmk98 912809810a added Raft BoundedFullSync functions which were overwritten as a part upstream merge 2018-09-27 07:27:37 +00:00
Peter Fox 073f73b778 Merge branch 'master' of https://github.com/jpmorganchase/quorum into bugfix/sendTransactionAsync-updates 2018-09-24 13:49:50 +01:00
Brian Schroeder 8c9ed51fa0 Disallow p2p or raft port reuse for raft consensus (#524) 2018-09-21 11:57:26 -04:00
Nguyen Kien Trung 6c9ec6b1d9 added travis status (#535) 2018-09-20 15:18:14 -04:00
Peter Fox 237bdbace5 Rearrange method to remove unneeded goroutine (since we are already in
a goroutine at this point)
2018-09-20 13:26:12 +01:00
Peter Fox 93793cff0b Adds the RPC request ID to the context which is passed to called method.
Update request/response data structs to include extra fields

Refactor the SendTransactionAsync method to just call the
SendTransaction method in a goroutine, instead of reimplementing logic
for a new transaction.
2018-09-20 12:13:09 +01:00
Peter Fox ffcb3f4635 Merge remote-tracking branch 'origin/master' 2018-09-20 10:36:14 +01:00
fixanoid f5a7d16955
Update README.md 2018-09-19 14:38:20 -04:00
Samer Falah c9ae8572a3
Merge pull request #533 from apratt3377/feature/cliqueConsensus
Add support for clique consensus
2018-09-19 10:50:29 -04:00
Samer Falah 2131e96da1
Merge pull request #517 from jpmorganchase/private-revert-fix
Fix consensus on private contract failure. Fixes #434
2018-09-18 17:12:22 -04:00
Samer Falah a34b72577e
Merge pull request #521 from trung/f-istanbul-backlogs
Fixes #481 memory leak in `backlogs` .
2018-09-18 17:06:38 -04:00
Nguyen Kien Trung 08f3a5b76a Added bootnode build and to docker image (#526) 2018-09-17 11:34:29 -04:00
apratt3377 0af7ad0664 Feature/410/expose raft cluster api (#501)
* Added an endpoint to expose raft cluster details
2018-09-11 15:05:42 -04:00
Trung Nguyen 5595b30f3e
merged with upstream 2018-09-11 13:04:28 -04:00
apratt3377 bfe9e503f9 add puppeth instructions 2018-09-11 12:38:52 -04:00
Nguyen Kien Trung f13b6aad4f Travis an unit test fixes (#519)
* Used Tessera as a fall back when Constellation is not available in the host
* Used OSX 10.12 instead of 10.13 to avoid Kernel Extension Consent which is not available in CI environment. Can revert back once Travis CI has ability to disable the consent
* Merged upstream PR/Code to fix tests which have intermittent failures
* Cleaned up .travis.yml build matrix
2018-09-11 11:25:24 -04:00
apratt3377 0d0e7550b5 Merge remote-tracking branch 'origin/master' into feature/cliqueConsensus 2018-09-10 16:01:31 -04:00
Joel Burget 1b301d5ead Fix consensus on private contract failure.
Previously we had populated the public receipt `failed` field with the
result of the transaction. This is correct for public transactions. It's
also correct for successful private transactions. But it's not correct
for failing private transactions, because their public receipt should
not indicate failure. The fix is straightforward.

Testing:

I used this contract:

    contract RevertTest{
       uint public newValue;
       function revertFunction() public{
           uint a = 1;
           require(a == 0);
       }
    }

After deploying the contract I sent in several failing transactions via

    function sendBad() {
      eth.sendTransaction({
      from: eth.accounts[0],
      data: web3.sha3("revertFunction()"),
      gas: 0x47b760,
      privateFor: ["ROAZBWtSacxXQrOe3FGAqJDyJjFePR5ce4TSIzmJ0Bc="]
      });
    }

Watching the logs (`1.log` and `2.log`), I saw the `TX-ACCEPTED` events
scroll as I sent `revertFunction` transactions. I see 10 `TX-ACCEPTED`
events in both logs (1 for deploy and 9 tests via `sendBad`).

Via extra logging, in `1.log` I see that the public receipts have status
`1`, whereas private receipts have status `0`. In `2.log` they all have
status `1`.

All nodes stayed up the whole time.

Fixes #434
2018-09-08 10:48:29 -07:00
fixanoid 0a6e14ab61
Formatting 2018-09-07 14:09:34 -04:00
Krish1979 8881459b3d Documentation update on additional Quorum private APIs (#516) 2018-09-07 14:06:00 -04:00
Trung Nguyen 7af7d8cfef
avoid growing backlogs when valSet changes 2018-09-05 17:22:42 -04:00
apratt3377 566a3c0ee0
add clique poa consensus link 2018-09-05 10:03:34 -04:00
Angela Pratt d98f0fce0d enable clique poa consensus 2018-09-05 09:49:53 -04:00
Peter Fox 880d9902ed Merge remote-tracking branch 'origin/master' 2018-08-29 11:17:08 +01:00
chris-j-h 06342c9490 Documentation wording and formatting changes (#492)
Documentation updates and added Tessera.
2018-08-24 09:08:02 -04:00
jpmsam 99a83767cc quorum version update 2018-08-23 15:09:29 -04:00
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
amalraj.manigmail.com 12b6c5376f core/tx_pool: fix chainId name to chainID and test 2018-08-16 17:35:16 +08:00
amalraj.manigmail.com 9cf76b8aef Merge remote-tracking branch 'remotes/upstream/master' into merge-1812-updated 2018-08-16 17:12:01 +08: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
amalraj.manigmail.com d6a49e36ca internal/ethapi: fix nil pointer exception for private send txn 2018-08-06 23:57:39 +08:00
amalraj.manigmail.com 95a1b03c3e merge 1.8.12 with upstream/master to apply the fixes/changes added newly 2018-08-06 19:03:51 +08:00
amalraj.manigmail.com e6773756fb merge 1.8.12 with upstream/master to apply the fixes/changes added newly 2018-08-06 19:03:51 +08: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