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

10202 Commits

Author SHA1 Message Date
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 912809810a added Raft BoundedFullSync functions which were overwritten as a part upstream merge 2018-09-27 07:27:37 +00:00
vsmk98 b11c0f5ba7 Removed unnecessary files 2018-09-27 03:16:17 +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
vsmk98 5c7d74ad45 code clean up 2018-09-20 05:55:57 +00:00
vsmk98 efda58b5a5 Contract changes to remove canLead 2018-09-20 03:18:39 +00:00
vsmk98 1557f0ee2b Added peer disconmnect for Istanbul 2018-09-20 01:51:36 +00: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
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
vsmk98 02e4344b4b changes to disconnect peer upon blacklisting 2018-09-19 06:55:41 +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
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
vsmk98 8d95a0ef8e Blacklisting nodes to disconnect the p2p peer 2018-09-18 05:52:46 +00:00
Nguyen Kien Trung 08f3a5b76a Added bootnode build and to docker image (#526) 2018-09-17 11:34:29 -04:00
vsmk98 057f11b5e8 Raft: private state tridb commit added 2018-09-14 03:59:10 +00:00
apratt3377 513c8c4720 add comments 2018-09-12 14:40:26 -04:00
apratt3377 cce5cc4273 fix comments 2018-09-12 14:39:17 -04:00
apratt3377 8c3dabb282 add comments and doc 2018-09-12 13:39:17 -04:00
apratt3377 3312757c21 add simulated abigen example 2018-09-12 10:35: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
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
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
vsmk98 78bd7e606a Contract changes for majority voting 2018-09-06 02:40:21 +00: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
vsmk98 5de9b000b7 Additional changes for blacklisting 2018-09-03 06:59:45 +00:00
vsmk98 d7688662b4 Changes for node blacklisting 2018-08-31 11:35:35 +00:00
vsmk98 b0896a48a6 added Raft BoundedFullSync functions which were overwritten as a part upstream merge 2018-08-30 06:59:45 +00:00
vsmk98 ee4034f49e Reverted changes of passing knownNodes to isNodePermissioned 
(cherry picked from commit 604f99c79f808d43362071f11fa0e96add5ae8f9)
 2018-08-30 06:58:14 +00: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