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
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
vsmk98
7e35574def
merge with 1.8.12 version
2018-08-17 03:20:33 +00: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
vsmk98
506a92bac9
added a hack to prevent multipl writes of the same enode to permissions-nodes.json
2018-08-13 06:55:58 +00:00
Sai V
5ba6b29d44
Merge pull request #4 from vsmk98/temp-Perm-188
...
changes to incorporate map and refactoring of code
2018-08-13 10:56:57 +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
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
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
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