Commit Graph

1378 Commits

Author SHA1 Message Date
amalraj.manigmail.com 3cb4bc2536 use lru cache for storing account access and org key map 2018-11-07 20:38:48 +08:00
vsmk98 6c34dc5199 Fixed error handling 2018-11-07 16:17:56 +08:00
vsmk98 b28fa8b445 additional APIs 2018-11-07 13:58:51 +08:00
vsmk98 3c68a587ba Added additional APIs 2018-11-05 23:44:23 +08:00
vsmk98 df4bec88db removed logging 2018-11-05 11:28:33 +08:00
vsmk98 fd598b49b8 merge with Amals changes 2018-11-02 22:59:20 +08:00
vsmk98 e949a737ab additional changes for permissions 2018-11-02 18:42:14 +08:00
amalraj.manigmail.com fac700181b add comments to quorum api 2018-11-01 13:45:16 +08:00
amalraj.manigmail.com d0c3191d83 quorum/api: add SendTxArgs to accept txn args 2018-11-01 13:12:11 +08:00
vsmk98 5cd1b2c561 formatting changes 2018-11-01 11:02:13 +08:00
amalraj.manigmail.com 033a128450 improvements to quorum api code 2018-10-31 20:46:54 +08:00
amalraj.manigmail.com 01233f583e read account from wallet 2018-10-31 15:15:34 +08:00
amalraj.manigmail.com 46cf4ddfb6 add apis for org key management 2018-10-30 15:59:08 +08:00
amalraj.manigmail.com 1f2504ff08 add all APIs related to node permission 2018-10-30 15:05:41 +08:00
amalraj.manigmail.com 64d8db5678 add api implementation for permission node - propose node 2018-10-30 10:41:01 +08:00
vsmk98 519348e621 Cherry pick pvt abigen. Make errors exist 2018-10-23 10:21:57 +08:00
vsmk98 d6352b30c3 Merge of 1812 with permissions changes and fix of conflicts 2018-10-12 04:24:36 +00:00
amalraj.manigmail.com 662ee40ede fix go test cases 2018-10-10 11:28:19 +08:00
amalraj.manigmail.com fcfc7b6d45 merge with quorum upstream master 2018-10-09 16:01:11 +08:00
vsmk98 8c2a8ab32a reverted some changes 2018-10-08 06:29:11 +00:00
vsmk98 d20b42b6a6 test changes 2018-10-05 08:31:09 +00:00
vsmk98 c245bf5c8a reverting changes 2018-10-05 08:20:21 +00:00
Sai Valiveti 9ab2f224d9 Node crash issue fix 2018-10-05 14:59:20 +08:00
vsmk98 f9a6f1fbb2 code changed for key delete scenario 2018-10-02 08:28:55 +00:00
Nguyen Kien Trung 40f7d2b8b4 Value Transfer in Private Transactions (#538)
Fix #528
2018-10-01 14:37:05 -04:00
vsmk98 7dcd66a543 Cluster key related changes 2018-09-27 11:24:38 +00: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 8dcf1fc02c clean up of log messsages 2018-09-19 07:05:43 +00:00
vsmk98 923d032ea5 clean up of log messsages 2018-09-19 07:01:58 +00:00
vsmk98 405da3b357 clean up of log messsages 2018-09-19 06:59:15 +00: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
vsmk98 057f11b5e8 Raft: private state tridb commit added 2018-09-14 03:59:10 +00: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 8b1edde801 allow private transactions with abigen 2018-09-10 15:44:07 -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
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
vsmk98 7e35574def merge with 1.8.12 version 2018-08-17 03:20:33 +00: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
vsmk98 7038131501 changes to incorporate map and refactoring of code 2018-08-13 02:00:35 +00: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 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
vsmk98 3cc3978171 Enabling account level permissions adding permissions cache file 2018-08-06 08:18:54 +00:00
vsmk98 fce19dac48 Enabling account level permissions 2018-08-06 05:26:29 +00:00
Samer Falah 58f291f8ff Reject transactions with not enough gas from being sent (#443)
Fixes #309
2018-08-01 11:13:29 -04:00
vsmk98 4e3c907531 additionla log messages for permissioning 2018-07-31 01:42:51 +00:00
Sai V ad7c031e85 eth - Storage root retrieval for accounts (#436)
re-enabling eth_storagRoot call
2018-07-27 08:37:29 -04:00
vsmk98 8b31b8931d Transaction level control 2018-07-27 01:29:52 +00:00