Commit Graph

10450 Commits

Author SHA1 Message Date
amalraj.manigmail.com 519337a9d0 Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16 2018-11-29 16:57:27 +08:00
Samer Falah 8c4aea54d1
Merge pull request #581 from trung/fix-tx_pool_test
Fix method signature for txpool test.
2018-11-28 16:22:37 -05:00
Trung Nguyen c2a580217f
fixed method signature 2018-11-28 16:17:05 -05:00
Samer Falah df7eb27375
Merge pull request #542 from vsmk98/geth-upgrade-1.8.12
Upgrade Quorum to geth 1.8.12
2018-11-28 15:53:43 -05:00
vsmk98 36000ec2a1 changes to set readOnlyDepth only once during the entire opCode execution 2018-11-28 15:01:52 +08:00
fixanoid a913c4cee8
Update HACKING.md 2018-11-27 13:10:02 -05:00
amalraj.manigmail.com 7e1aa97d65 core/vm: revert to joel's change to getdualstate. This is a mandatory change for quorum
dual state & read only EVM

    This commit implements a dual state approach. The dual state approach
    separates public and private state by making the core vm environment
    context aware.

    Although not currently implemented it will need to prohibit value
    transfers and it must initialise all transactions from accounts on the
    public state. This means that sending transactions increments the
    account nonce on the public state and contract addresses are derived
    from the public state when initialised by a transaction. For obvious
    reasons, contract created by private contracts are still derived from
    public state.

    This is required in order to have consensus over the public state at all
    times as non-private participants would still process the transaction on
    the public state even though private payload can not be decrypted. This
    means that participants of a private group must do the same in order to
    have public consensus. However the creation of the contract and
    interaction still occurs on the private state.

    It implements support for the following calling model:

    S: sender, (X): private, X: public, ->: direction, [ ]: read only mode

    1. S -> A -> B
    2. S -> (A) -> (B)
    3. S -> (A) -> [ B -> C ]

    It does not support

    1. (S) -> A
    2. (S) -> (A)
    3. S -> (A) -> B

    Implemented "read only" mode for the EVM. Read only mode is checked
    during any opcode that could potentially modify the state. If such an
    opcode is encountered during "read only", it throws an exception.

    The EVM is flagged "read only" when a private contract calls in to
    public state.
2018-11-27 11:36:59 +08:00
amalraj.manigmail.com 7c03ee7208 Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.12
# Conflicts:
#	core/tx_pool_test.go
#	miner/worker.go
2018-11-27 10:45:11 +08:00
amalraj.manigmail.com 66d46778e6 Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.12
# Conflicts:
#	core/tx_pool_test.go
#	miner/worker.go
2018-11-26 15:17:57 +08:00
Samer Falah 12f00d5c8f
Merge pull request #577 from trung/fix-unit-test
fix unit test for PR 510
2018-11-23 11:39:20 -05:00
Trung Nguyen 99dcc0fd3f
fix unit test for PR 510 2018-11-23 11:20:31 -05:00
Samer Falah 40cf04732e
Merge pull request #510 from nathanawmk/master
Update max transaction size limit.
2018-11-23 10:16:54 -05:00
amalraj.manigmail.com 1783419ce5 core/vm : remove get dual state calls in some op codes as its unnecessary. evm push is setting stateDB to public / private correctly. 2018-11-23 14:51:03 +08:00
amalraj.manigmail.com 33724be5a7 revert to getDualState instead of evm.StateDB as per quorum 2018-11-22 17:08:45 +08:00
amalraj.manigmail.com 8438d79754 update gas limit as per quorum upstream 2018-11-22 15:41:04 +08:00
amalraj.manigmail.com 434c1f7f75 update gas limit as per quorum upstream 2018-11-21 17:27:28 +08:00
amalraj 2f74406baa
Merge pull request #8 from SatpalSandhu61/geth-upgrade-1.8.12-revert-estimategas-fix
Revert fix for eth_estimateGas due to side-effect where attempt to pu…
2018-11-08 10:29:22 +08:00
Samer Falah 98582168e3
Merge pull request #555 from vdamle/permissioned-log
p2p: remove spurious log for denied node permissioning
2018-11-07 17:54:42 +01:00
Samer Falah 134059e5f7
Merge pull request #556 from jbhurat/missing-private-bloom-state
Writing private block bloom for miner
2018-11-07 17:52:01 +01:00
SatpalSandhu61 470f34a784 Revert fix for eth_estimateGas due to side-effect where attempt to purely read private state doesn't work correctly. 2018-11-07 13:51:05 +00:00
amalraj f02d8d642d
Merge pull request #7 from SatpalSandhu61/geth-upgrade-1.8.12-fix-for-large-gas-estimate
Geth upgrade 1.8.12 fix for large gas estimate
2018-11-01 16:46:16 +08:00
SatpalSandhu61 97dfe51a56 Remove logging used for investigation. 2018-10-24 11:59:40 +01:00
amalraj.manigmail.com 8c339adc6c merge with upstream/master 2018-10-24 11:29:04 +08:00
amalraj.manigmail.com 70c78cc304 Revert "Fix vendor package error in Mojave"
This reverts commit e679587e1f.
2018-10-24 11:22:22 +08:00
SatpalSandhu61 e6dd33d71b Adding fix for eth_estimateGas - ensure private state is initialised before creating EVM. 2018-10-23 09:03:34 +01:00
Nguyen Kien Trung 347f6fc356 Docker: Add git commit hash (#554) 2018-10-22 15:00:03 -04:00
Jitendra Bhurat a3ec05d471 Writing private block bloom for miner 2018-10-19 09:56:48 -04:00
Vinod Damle 2f14958559 p2p: remove spurious log for denied node permissioning
connection is only denied after cycling through entire list, remove
confusing and erroneous log in the loop
2018-10-17 11:53:13 -04:00
SatpalSandhu61 487910af77 Additional logging to investigate issue with very large eth_estimateGas value 2018-10-17 16:24:45 +01:00
jpmsam 0d0c507a59 Quorum version update 2018-10-16 16:56:55 -04:00
vsmk98 e679587e1f Fix vendor package error in Mojave 2018-10-12 12:23:13 +08:00
vsmk98 e3dddcafaa Reverted to 1.10 version of go for docker
changed author name
2018-10-12 10:32:30 +08:00
Sai Valiveti c1fbb5143a Merge branch 'geth-upgrade-1.8.12' of https://github.com/vsmk98/quorum into geth-upgrade-1.8.12
eth stat changes
2018-10-12 10:23:30 +08:00
amalraj.manigmail.com 46472a2b64 ethstats: pass engine protocol name for quorum 2018-10-12 00:43:30 +08:00
Sai Valiveti c73c1ff592 Reverted to go version 1.9 in Dockerfile 2018-10-11 15:49:51 +08:00
amalraj.manigmail.com c0373acd72 keep only linux and mac OS build configs in travis 2018-10-10 14:04:45 +08:00
amalraj.manigmail.com b24daed8af remove swarm/network/simulations/discovery TestDiscoverySimulationDockerAdapter go test as it is failing in go-ethereum 1.8.12 up-stream 2018-10-10 12:34:11 +08:00
amalraj.manigmail.com 662ee40ede fix go test cases 2018-10-10 11:28:19 +08:00
amalraj.manigmail.com 8f51fb3e00 remove failing ethash test case as its not supported by quorum 2018-10-10 11:27:51 +08:00
amalraj.manigmail.com fcfc7b6d45 merge with quorum upstream master 2018-10-09 16:01:11 +08:00
Samer Falah 4d015bb488
Merge pull request #541
Update signing issue for eth_sendTransactionAsync RPC call
2018-10-08 16:29:51 -04:00
amalraj.manigmail.com 89cca5093d miner/worker: use worker.current.state instead of task.state to keep it consistent with references to state in other parts of code 2018-10-08 18:45:56 +08:00
vsmk98 8c2a8ab32a reverted some changes 2018-10-08 06:29:11 +00:00
Péter Szilágyi 1ed50aa4e3 trie: handle removing the freshest node too 2018-10-08 03:48:01 +00:00
Peter Fox 7a282ff433 Inline example data 2018-10-05 20:20:18 +01:00
fixanoid 581eed5a0f
Adding docker hub link 2018-10-05 11:39:41 -04:00
amalraj.manigmail.com 2ba4fe0ec0 istanbul/backend: handle nil on result returned from commitCh 2018-10-05 20:18:26 +08: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
amalraj.manigmail.com ac82df8c74 add back karalabe/cookierjar.v2/collections/prque that was removed in geth 1.8.16, its used by raft 2018-10-05 15:31:40 +08:00