amalraj.manigmail.com
bc529a509d
Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18
...
# Conflicts:
# .github/CONTRIBUTING.md
# .travis.yml
# core/blockchain.go
# core/vm/evm.go
# core/vm/logger_test.go
# eth/handler_test.go
# eth/tracers/tracer_test.go
# internal/ethapi/api.go
# internal/web3ext/web3ext.go
# p2p/discover/node.go
# p2p/server.go
# swarm/network/simulations/discovery/discovery_test.go
2019-01-29 19:08:14 +08:00
amalraj.manigmail.com
8e30fc202a
Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18
...
# Conflicts:
# consensus/ethash/consensus.go
# eth/bloombits.go
# params/protocol_params.go
2019-01-25 22:29:22 +08:00
amalraj.manigmail.com
2914b3c99d
Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18
...
# Conflicts:
# consensus/ethash/consensus.go
# eth/bloombits.go
# params/protocol_params.go
2019-01-25 22:24:03 +08:00
Samer Falah
e8458c028d
Merge pull request #618 from SatpalSandhu61/print-vm-failure-reason-to-log
...
Print vm failure reason to log
2019-01-23 15:11:42 -05:00
Nguyen Kien Trung
be5f333767
Binaries distribution to Bintray ( #623 )
...
distribute binaries to bintray when tagging
2019-01-23 15:10:09 -05:00
Nguyen Kien Trung
a4580fc22e
Minor update to README ( #622 )
...
* Added full logo link
* Added download link
2019-01-16 16:19:44 -05:00
fixanoid
c6f0ae4e29
Quorum version bump
2019-01-16 17:28:01 +00:00
SatpalSandhu61
895947de48
Currently, we can't tell the reason for evm failure, so change log message for EVM failure reason from Debug to Info. This is helpful to users and makes analysis of issues much easier.
2019-01-10 13:54:38 +08:00
SatpalSandhu61
f69ae6c19a
Merge branch 'master' of https://github.com/jpmorganchase/quorum
2019-01-09 12:04:11 +08:00
Samer Falah
d77cb778ca
Merge pull request #563 from Puneetha17/private_rawtx
...
Do not reset V value if the tx is already set to private
2019-01-07 09:22:20 -05:00
Samer Falah
c090cea617
Merge pull request #591 from QuorumEngineering/feature/support-private-sendRawTransaction-merge
...
feature/support private sendRawTransaction
2019-01-04 15:18:15 -05:00
namtruong
01a8a5ec80
minor documentation update
2019-01-04 19:32:17 +00:00
namtruong
e92052b3a4
return error when sendRawPrivateTransaction is called to submit public transaction (privateFor list empty)
2019-01-03 15:26:42 +00:00
Samer Falah
decb4c76b4
Merge pull request #592 from trung/staticcall-dual-state
...
added dual state implementation to StaticCall
2019-01-01 13:59:13 +00:00
Samer Falah
1092eac015
Merge pull request #597 from jpmorganchase/fd-limit-max-out
...
Maxing out fdlimit per go-ethereum#18211
2018-12-13 15:27:59 -05:00
Samer Falah
004dd53a68
Merge pull request #598 from jbhurat/miner-setcoinbase
...
Prevent deadlock when miner.setEtherbase is called for Istanbul consensus
2018-12-13 15:19:45 -05:00
Jitendra Bhurat
aea11d53a8
calling unlock using defer, preventing deadlock when miner.setEtherbase() returns an error
2018-12-13 12:31:50 -05:00
Felix Shnir
bd558eff27
Cherrypicking go-ethereum#18211 pull
2018-12-13 16:32:48 +00:00
SatpalSandhu61
7deea65847
Merge branch 'master' of https://github.com/jpmorganchase/quorum
2018-12-13 11:50:11 +00:00
jpmsam
8f678278aa
quorum version update
2018-12-12 15:27:29 -05:00
Trung Nguyen
67c9b4332f
staticcall does not modify states so no need to push to stack
2018-12-11 16:54:18 -05:00
Samer Falah
df03a37833
Merge pull request #585 from jbhurat/estimate-gas
...
Fixing high estimate gas issue
2018-12-11 16:47:37 -05: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