Commit Graph

10995 Commits

Author SHA1 Message Date
Samer Falah df03a37833
Merge pull request #585 from jbhurat/estimate-gas
Fixing high estimate gas issue
2018-12-11 16:47:37 -05:00
Trung Nguyen 1007ea93e2
fixed unit test 2018-12-11 11:28:26 -05:00
Trung Nguyen 85d3c4d031
merged from upstream/master 2018-12-11 10:43:48 -05:00
vsmk98 7903dac340 latest changes for cluster key management 2018-12-11 10:07:19 +05:30
SatpalSandhu61 50da8eaf0d Fix for issue 576 where private transactions can cause block gas limit to be exceeded, leading to BAD BLOCK. 2018-12-10 15:30:28 +00:00
SatpalSandhu61 5af110984a Fix for issue 576 where private transactions can cause block gas limit to be exceeded, leading to BAD BLOCK. 2018-12-10 09:58:16 +00:00
Jitendra Bhurat 7803a2f7ef Setting the private state to public state if contract address is not present in the private state 2018-12-06 11:02:12 -05:00
Trung Nguyen 089841e036
added dual state implementation to StaticCall 2018-12-05 13:47:01 -05:00
namtruong c49a833eb9 add support for private sendRawTransaction - merge with latest quorum 2018-12-05 14:30:42 +00:00
fixanoid 47954d8a55
Update BUILDING.md 2018-12-04 11:24:07 -05:00
Samer Falah 37408453f4
Merge pull request #586 from trung/fix-ethereum-tests
tests/: minor refactoring to enable Ethereum tests
2018-12-03 17:26:35 -05:00
fixanoid 55aeeb4135
Updating IBFT API doc location 2018-12-03 17:14:27 -05:00
fixanoid 119412f75a
Update README.md 2018-12-03 17:13:44 -05:00
fixanoid f5ffeef64b
Istanbul RPC API 2018-12-03 17:11:54 -05:00
fixanoid 503935ccce
Adding istanbul-tools ref 2018-12-03 17:08:07 -05:00
fixanoid 5758e38962
Updating raft doc location 2018-12-03 17:03:04 -05:00
fixanoid f83e31a4f5 Moving Raft doc into docs 2018-12-03 21:59:49 +00:00
Trung Nguyen 1b543eb0ba
separated consts for Quorum and those used in upstream Geth 2018-12-03 11:10:55 -05:00
fixanoid eab8d793f9
Update NOTES.md 2018-12-03 10:04:37 -05:00
fixanoid 9e08c25f2c
Rename HACKING.md to NOTES.md 2018-12-03 10:02:59 -05:00
Samer Falah d4db92f69e
Merge pull request #570 from jbhurat/missing-logs-events
Adding private log blooms to DB in addition to public log bloom
2018-12-02 20:08:30 -05:00
Trung Nguyen dd5dafe865
simplify the setup 2018-11-30 17:26:05 -05:00
Trung Nguyen a916458aff
tests/: minor refactoring to enable Ethereum tests 2018-11-30 17:24:50 -05:00
SatpalSandhu61 912140d06f Merge branch 'master' of https://github.com/jpmorganchase/quorum 2018-11-29 10:53:52 +00:00
amalraj.manigmail.com 13a9f26f9a Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16 2018-11-29 17:56:02 +08:00
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
vsmk98 e22b4929bf changes to contract 2018-11-26 13:38:36 +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
SatpalSandhu61 9bcfef050e Merge branch 'master' of https://github.com/jpmorganchase/quorum 2018-11-23 11:48:42 +00:00
vsmk98 6b132548ec Merge remote-tracking branch 'vsmk/geth-upgrade-1.8.12' into 1812-permission-rpc-api
merge with geth-upgrade-1812
2018-11-23 17:29:26 +08:00
vsmk98 39c1ac8ff8 Merge branch 'geth-upgrade-1.8.12' into 1812-permission-rpc-api
changes to revert getDualState
2018-11-23 17:12:04 +08: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
vsmk98 dfdc5e11b0 logic changes to clusetr key contract to handle org suborg 2018-11-22 10:16:34 +08:00
amalraj.manigmail.com 434c1f7f75 update gas limit as per quorum upstream 2018-11-21 17:27:28 +08:00
vsmk98 09dced454b optimized the solc contract code for AWS deployment 2018-11-21 16:48:03 +08:00
vsmk98 5b34cb7eee handling null pointer error for voter list when network brought in non permissioned mode 2018-11-20 22:51:49 +08:00
vsmk98 939142786e handled null pointer error for permissioned node and account list when network is brought in non-permissioned mode 2018-11-20 22:36:24 +08:00
vsmk98 cdf0e0dd5e validation to check voter account access before adding as voter 2018-11-20 21:29:03 +08:00