vsmk98
d6352b30c3
Merge of 1812 with permissions changes and fix of conflicts
2018-10-12 04:24:36 +00:00
amalraj.manigmail.com
662ee40ede
fix go test cases
2018-10-10 11:28:19 +08:00
amalraj.manigmail.com
fcfc7b6d45
merge with quorum upstream master
2018-10-09 16:01:11 +08:00
vsmk98
8c2a8ab32a
reverted some changes
2018-10-08 06:29:11 +00: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
Sai Valiveti
9ab2f224d9
Node crash issue fix
2018-10-05 14:59:20 +08:00
vsmk98
f9a6f1fbb2
code changed for key delete scenario
2018-10-02 08:28:55 +00:00
Nguyen Kien Trung
40f7d2b8b4
Value Transfer in Private Transactions ( #538 )
...
Fix #528
2018-10-01 14:37:05 -04:00
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
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
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
vsmk98
057f11b5e8
Raft: private state tridb commit added
2018-09-14 03:59:10 +00: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
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
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
vsmk98
7e35574def
merge with 1.8.12 version
2018-08-17 03:20:33 +00: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
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
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
Samer Falah
58f291f8ff
Reject transactions with not enough gas from being sent ( #443 )
...
Fixes #309
2018-08-01 11:13:29 -04:00
vsmk98
4e3c907531
additionla log messages for permissioning
2018-07-31 01:42:51 +00:00
Sai V
ad7c031e85
eth - Storage root retrieval for accounts ( #436 )
...
re-enabling eth_storagRoot call
2018-07-27 08:37:29 -04:00
vsmk98
8b31b8931d
Transaction level control
2018-07-27 01:29:52 +00:00
amalraj.manigmail.com
a8d8dc52a5
core: accept changes to validateEvents and test cases from 1.8.12
2018-07-26 19:20:40 +08:00
amalraj.manigmail.com
827cdb7542
core: restore test TestEIP161AccountRemoval from previous quorum version as it is specific to quorum
2018-07-25 14:50:12 +08:00
amalraj.manigmail.com
c0b7b1122f
core/types: restore test TestTransactionEncode2 from previous quorum version as it is specific to quorum
2018-07-25 14:36:01 +08:00
amalraj.manigmail.com
648465f192
core/types: fix TestEIP155SigningVitalik and TestChainId test cases
2018-07-25 11:44:36 +08:00
amalraj.manigmail.com
7c548e0f74
Merge remote-tracking branch 'remotes/geth/release/1.8' into merge-193
...
changes related to merge conflicts
2018-07-24 16:15:38 +08:00
amalraj.manigmail.com
c3c479d2aa
Merge remote-tracking branch 'remotes/geth/release/1.8' into merge-193
...
# Conflicts:
# .github/CODEOWNERS
# .travis.yml
# README.md
# VERSION
# accounts/abi/argument.go
# accounts/abi/bind/backends/simulated.go
# accounts/abi/bind/bind_test.go
# accounts/abi/event_test.go
# accounts/abi/numbers.go
# accounts/abi/numbers_test.go
# accounts/abi/reflect.go
# accounts/accounts.go
# accounts/keystore/keystore.go
# accounts/keystore/keystore_wallet.go
# accounts/usbwallet/internal/trezor/trezor.go
# accounts/usbwallet/ledger.go
# accounts/usbwallet/wallet.go
# appveyor.yml
# build/ci.go
# build/goimports.sh
# cmd/ethkey/generate.go
# cmd/ethkey/inspect.go
# cmd/ethkey/main.go
# cmd/ethkey/message.go
# cmd/ethkey/utils.go
# cmd/faucet/faucet.go
# cmd/geth/chaincmd.go
# cmd/geth/config.go
# cmd/geth/main.go
# cmd/geth/misccmd.go
# cmd/geth/usage.go
# cmd/p2psim/main.go
# cmd/puppeth/genesis.go
# cmd/puppeth/module_dashboard.go
# cmd/puppeth/wizard_faucet.go
# cmd/puppeth/wizard_genesis.go
# cmd/puppeth/wizard_netstats.go
# cmd/puppeth/wizard_node.go
# cmd/puppeth/wizard_wallet.go
# cmd/swarm/config.go
# cmd/swarm/config_test.go
# cmd/swarm/db.go
# cmd/swarm/hash.go
# cmd/swarm/main.go
# cmd/swarm/manifest.go
# cmd/swarm/run_test.go
# cmd/swarm/upload.go
# cmd/swarm/upload_test.go
# cmd/utils/flags.go
# cmd/wnode/main.go
# common/bytes.go
# common/compiler/solidity.go
# common/hexutil/hexutil.go
# common/math/big.go
# common/math/integer.go
# common/mclock/mclock.go
# common/types.go
# common/types_template.go
# consensus/clique/clique.go
# consensus/consensus.go
# consensus/ethash/algorithm.go
# consensus/ethash/consensus.go
# consensus/ethash/ethash.go
# containers/vagrant/Vagrantfile
# contracts/ens/ens_test.go
# core/asm/compiler.go
# core/asm/lexer.go
# core/block_validator.go
# core/blockchain.go
# core/blockchain_test.go
# core/chain_makers.go
# core/database_util.go
# core/database_util_test.go
# core/events.go
# core/genesis.go
# core/genesis_alloc.go
# core/genesis_test.go
# core/headerchain.go
# core/rawdb/accessors_chain.go
# core/rawdb/accessors_indexes.go
# core/rawdb/accessors_metadata.go
# core/rawdb/schema.go
# core/state/state_test.go
# core/state/statedb.go
# core/state/sync.go
# core/state_processor.go
# core/state_transition.go
# core/tx_journal.go
# core/tx_list.go
# core/tx_pool.go
# core/tx_pool_test.go
# core/types.go
# core/types/block.go
# core/types/block_test.go
# core/types/gen_receipt_json.go
# core/types/log.go
# core/types/receipt.go
# core/types/transaction.go
# core/types/transaction_signing.go
# core/types/transaction_signing_test.go
# core/types/transaction_test.go
# core/vm/errors.go
# core/vm/evm.go
# core/vm/gas.go
# core/vm/gas_table.go
# core/vm/instructions.go
# core/vm/instructions_test.go
# core/vm/interface.go
# core/vm/interpreter.go
# core/vm/intpool.go
# core/vm/jump_table.go
# core/vm/logger.go
# core/vm/logger_test.go
# core/vm/memory_table.go
# core/vm/opcodes.go
# core/vm/runtime/env.go
# core/vm/runtime/runtime.go
# crypto/crypto.go
# crypto/crypto_test.go
# eth/api.go
# eth/api_backend.go
# eth/api_tracer.go
# eth/backend.go
# eth/config.go
# eth/downloader/downloader.go
# eth/downloader/queue.go
# eth/downloader/statesync.go
# eth/filters/filter.go
# eth/filters/filter_system.go
# eth/filters/filter_system_test.go
# eth/gen_config.go
# eth/handler.go
# eth/handler_test.go
# eth/helper_test.go
# eth/protocol.go
# eth/sync.go
# eth/tracers/internal/tracers/4byte_tracer.js
# eth/tracers/internal/tracers/assets.go
# eth/tracers/tracer_test.go
# eth/tracers/tracers_test.go
# ethclient/ethclient.go
# ethdb/database.go
# ethdb/interface.go
# ethdb/memory_database.go
# ethstats/ethstats.go
# event/feed.go
# internal/ethapi/api.go
# internal/ethapi/backend.go
# internal/guide/guide_test.go
# internal/web3ext/web3ext.go
# les/api_backend.go
# les/backend.go
# les/fetcher.go
# les/handler.go
# les/helper_test.go
# les/odr_requests.go
# les/odr_test.go
# les/retrieve.go
# les/server.go
# les/serverpool.go
# light/lightchain.go
# light/odr_test.go
# light/postprocess.go
# light/txpool.go
# log/README.md
# log/doc.go
# log/format.go
# log/handler.go
# log/logger.go
# log/root.go
# metrics/exp/exp.go
# metrics/influxdb/influxdb.go
# metrics/metrics.go
# metrics/resetting_timer.go
# metrics/resetting_timer_test.go
# metrics/timer_test.go
# miner/worker.go
# mobile/accounts.go
# mobile/ethereum.go
# mobile/geth.go
# node/config.go
# node/doc.go
# p2p/discover/database.go
# p2p/discover/database_test.go
# p2p/discover/table.go
# p2p/discover/table_test.go
# p2p/discover/udp.go
# p2p/discover/udp_test.go
# p2p/discv5/udp.go
# p2p/enr/enr.go
# p2p/enr/enr_test.go
# p2p/enr/entries.go
# p2p/protocols/protocol.go
# p2p/protocols/protocol_test.go
# p2p/rlpx_test.go
# p2p/server.go
# p2p/simulations/adapters/docker.go
# p2p/simulations/adapters/exec.go
# p2p/simulations/adapters/inproc.go
# p2p/simulations/adapters/types.go
# p2p/simulations/http.go
# p2p/simulations/http_test.go
# p2p/simulations/mocker.go
# p2p/simulations/network.go
# p2p/simulations/network_test.go
# p2p/testing/protocolsession.go
# params/bootnodes.go
# params/config.go
# params/denomination.go
# params/gas_table.go
# params/protocol_params.go
# params/version.go
# rpc/http.go
# rpc/json.go
# rpc/utils.go
# signer/core/api.go
# swarm/api/api.go
# swarm/api/api_test.go
# swarm/api/client/client.go
# swarm/api/client/client_test.go
# swarm/api/config.go
# swarm/api/config_test.go
# swarm/api/filesystem.go
# swarm/api/filesystem_test.go
# swarm/api/http/error.go
# swarm/api/http/error_templates.go
# swarm/api/http/error_test.go
# swarm/api/http/roundtripper.go
# swarm/api/http/server.go
# swarm/api/http/server_test.go
# swarm/api/http/templates.go
# swarm/api/manifest.go
# swarm/api/manifest_test.go
# swarm/api/storage.go
# swarm/api/storage_test.go
# swarm/api/uri.go
# swarm/api/uri_test.go
# swarm/fuse/fuse_dir.go
# swarm/fuse/fuse_file.go
# swarm/fuse/swarmfs.go
# swarm/fuse/swarmfs_test.go
# swarm/fuse/swarmfs_unix.go
# swarm/fuse/swarmfs_util.go
# swarm/metrics/flags.go
# swarm/network/depo.go
# swarm/network/forwarding.go
# swarm/network/hive.go
# swarm/network/kademlia/address.go
# swarm/network/kademlia/kaddb.go
# swarm/network/kademlia/kademlia.go
# swarm/network/kademlia/kademlia_test.go
# swarm/network/messages.go
# swarm/network/protocol.go
# swarm/network/syncdb.go
# swarm/network/syncdb_test.go
# swarm/network/syncer.go
# swarm/services/swap/swap.go
# swarm/services/swap/swap/swap.go
# swarm/storage/chunker.go
# swarm/storage/chunker_test.go
# swarm/storage/common_test.go
# swarm/storage/database.go
# swarm/storage/dbstore.go
# swarm/storage/dbstore_test.go
# swarm/storage/dpa.go
# swarm/storage/dpa_test.go
# swarm/storage/localstore.go
# swarm/storage/memstore.go
# swarm/storage/netstore.go
# swarm/storage/pyramid.go
# swarm/storage/swarmhasher.go
# swarm/storage/types.go
# swarm/swarm.go
# swarm/swarm_test.go
# swarm/testutil/http.go
# tests/block_test_util.go
# tests/difficulty_test.go
# tests/init.go
# tests/state_test_util.go
# tests/transaction_test.go
# tests/util.go
# tests/vm_test_util.go
# trie/database.go
# trie/encoding.go
# trie/hasher.go
# trie/iterator.go
# trie/proof.go
# trie/proof_test.go
# trie/secure_trie.go
# trie/sync.go
# trie/sync_test.go
# trie/trie.go
# vendor/github.com/docker/docker/pkg/reexec/command_linux.go
# vendor/github.com/docker/docker/pkg/reexec/command_unix.go
# vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go
# vendor/github.com/docker/docker/pkg/reexec/command_windows.go
# vendor/github.com/docker/docker/pkg/reexec/reexec.go
# vendor/github.com/eapache/channels/.gitignore
# vendor/github.com/eapache/queue/.gitignore
# vendor/github.com/naoina/toml/encode.go
# vendor/github.com/naoina/toml/parse.go
# vendor/github.com/naoina/toml/parse.peg
# vendor/github.com/naoina/toml/parse.peg.go
# vendor/github.com/rcrowley/go-metrics/.gitignore
# vendor/github.com/rcrowley/go-metrics/.travis.yml
# vendor/github.com/rcrowley/go-metrics/README.md
# vendor/github.com/rcrowley/go-metrics/counter.go
# vendor/github.com/rcrowley/go-metrics/debug.go
# vendor/github.com/rcrowley/go-metrics/ewma.go
# vendor/github.com/rcrowley/go-metrics/exp/exp.go
# vendor/github.com/rcrowley/go-metrics/gauge.go
# vendor/github.com/rcrowley/go-metrics/gauge_float64.go
# vendor/github.com/rcrowley/go-metrics/graphite.go
# vendor/github.com/rcrowley/go-metrics/healthcheck.go
# vendor/github.com/rcrowley/go-metrics/histogram.go
# vendor/github.com/rcrowley/go-metrics/json.go
# vendor/github.com/rcrowley/go-metrics/log.go
# vendor/github.com/rcrowley/go-metrics/meter.go
# vendor/github.com/rcrowley/go-metrics/metrics.go
# vendor/github.com/rcrowley/go-metrics/opentsdb.go
# vendor/github.com/rcrowley/go-metrics/registry.go
# vendor/github.com/rcrowley/go-metrics/runtime.go
# vendor/github.com/rcrowley/go-metrics/sample.go
# vendor/github.com/rcrowley/go-metrics/syslog.go
# vendor/github.com/rcrowley/go-metrics/timer.go
# vendor/github.com/rcrowley/go-metrics/writer.go
# vendor/github.com/syndtr/goleveldb/leveldb/db.go
# vendor/golang.org/x/sys/unix/mksysnum_linux.pl
# vendor/golang.org/x/sys/unix/types_linux.go
# vendor/vendor.json
# whisper/shhclient/client.go
# whisper/whisperv5/api.go
# whisper/whisperv5/peer_test.go
# whisper/whisperv5/whisper.go
# whisper/whisperv6/api.go
# whisper/whisperv6/peer_test.go
# whisper/whisperv6/whisper.go
2018-07-24 16:11:05 +08:00
Satpal
e8f0ee9162
Prevent private transaction with ether value from becoming stuck in pending ( #451 )
2018-07-23 15:34:36 +01:00
Peter Fox
29257cafcd
Fix issue using correct state db
2018-07-15 23:36:47 +01:00
Peter Fox
8470793052
Update gas table to make use of the dual state db
2018-07-15 23:32:52 +01:00
Peter Fox
f25cdca033
Give Constellation time to start
2018-07-15 20:51:05 +01:00
Peter Fox
0c3bacede3
Add Constellation build files
2018-07-15 20:10:39 +01:00
Peter Fox
71e5e86ce0
Update files to keep in line with vanilla geth, adding back in the
...
pieces needed for Quorum.
2018-07-15 19:45:45 +01:00
Peter Fox
cdede06771
Let constellation have longer to start up
...
Add more gas for test
Set Quorum to be true
Update expected block hash in test
2018-07-13 11:33:52 +01:00
Samer Falah
38247083f3
Merge pull request #390 from tsuzukit/feature/fix_blockchain_test
...
Fix TestChainTxReorgs
2018-07-12 23:33:22 -04:00
vsmk98
fa134b402a
Permissions initial build
2018-07-11 07:25:45 +00:00
Samer Falah
01195280b4
Fixes value transfer ( #430 )
2018-07-05 13:59:33 -04:00
Guillaume Ballet
4e5d1f1c39
core/vm: reuse bigint pools across transactions ( #17070 )
...
* core/vm: A pool for int pools
* core/vm: fix rebase issue
* core/vm: push leftover stack items after execution, not before
2018-07-03 13:06:42 +03:00