d6352b30c3
Merge of 1812 with permissions changes and fix of conflicts
2018-10-12 04:24:36 +00:00
fcfc7b6d45
merge with quorum upstream master
2018-10-09 16:01:11 +08:00
2ad2e0b4bf
Added a validateConsensus() which exits geth if no consensus is speci… ( #540 )
...
Validate for a Quorum supported consensus and exit if no consensus is specified.
2018-10-01 16:39:01 -04:00
a574bc4026
code refactor for managing cluster key
2018-09-28 08:15:59 +00:00
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
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
7e35574def
merge with 1.8.12 version
2018-08-17 03:20:33 +00:00
fce19dac48
Enabling account level permissions
2018-08-06 05:26:29 +00:00
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
aaf0de899d
added function for event monitoring
2018-07-14 01:22:43 +00:00
1f4abe1ed4
refactoring of code for permissions
2018-07-12 10:00:19 +00:00
fa134b402a
Permissions initial build
2018-07-11 07:25:45 +00:00
1990c9e621
cmd/geth: export metrics to InfluxDB ( #16979 )
...
* cmd/geth: add flags for metrics export
* cmd/geth: update usage fields for metrics flags
* metrics/influxdb: update reporter logger to adhere to geth logging convention
2018-07-02 15:51:02 +03:00
8db8d074e2
cmd/geth: remove the tail "," from genesis config ( #17028 )
...
remove the tail "," from genesis config, which will cause genesis config parse error .
2018-06-21 10:44:39 +03:00
52f137c850
Feature/fix_some_tests ( #387 )
...
* same fix as ethereum/go-ethereum#15783
* Fix insufficient balance for transfer
* change chainId of QuorumTestChainConfig
2018-06-04 16:02:09 -04:00
a20cc75b4a
cmd/geth: cap cache allowance
2018-06-04 13:46:39 +03:00
622e98ad51
debug merge attempt
2018-05-31 14:21:16 +08:00
4b44bea1d7
Merge attempt
2018-05-31 14:16:44 +08:00
4ea493e7eb
cmd: various golint fixes ( #16700 )
...
* cmd: various golint fixes
* cmd: update to pr change request
* cmd: update to pr change request
2018-05-09 10:38:03 +03:00
6cf0ab38bd
core/rawdb: separate raw database access to own package ( #16666 )
2018-05-07 14:35:06 +03:00
e7067be94f
cmd/geth, mobile: add memsize to pprof server ( #16532 )
...
* cmd/geth, mobile: add memsize to pprof server
This is a temporary change, to be reverted before the next release.
* cmd/geth: fix variable name
2018-04-23 16:20:39 +03:00
26a4dbb467
cmd/geth: update the copyright year in the geth command usage ( #16537 )
2018-04-23 13:45:43 +03:00
8f8774cf6d
all: fix various typos ( #16533 )
...
* fix typo
* fix typo
* fix typo
2018-04-19 16:32:02 +03:00
c43792a42c
cmd/geth: update template for 'geth bug' command ( #16350 )
2018-04-06 12:42:11 +02:00
2a4bd55b43
cmd/geth: remove relOracle variable ( #16434 )
2018-04-04 12:22:26 +02:00
cf799e5eaa
whisper: switch all remaining components from v5 to v6
2018-03-26 16:36:14 +02:00
495bdb0c71
cmd: export preimages in RLP, support GZIP, uniform with block export
2018-03-26 14:08:01 +03:00
b6b6f52ec8
cmd: implement preimage dump and import cmds
2018-03-26 12:51:46 +03:00
3d013c1939
whisper: some components are still using v5, switch to v6
2018-03-22 15:48:52 +01:00
39c16c8a1e
cmd, ethdb, vendor: integrate leveldb iostats ( #16277 )
...
* cmd, dashboard, ethdb, vendor: send iostats to dashboard
* ethdb: change names
* ethdb: handle parsing errors
* ethdb: handle iostats syntax error
* ethdb: r -> w
2018-03-08 14:59:00 +02:00
704840a8ad
cmd, dashboard: use webpack dev server, remove custom assets ( #16263 )
...
* cmd, dashboard: remove custom assets, webpack dev server
* dashboard: yarn commands, small fixes
2018-03-08 10:22:21 +02:00
bfa1e921ce
cmd/geth: Remove unused strings import
2018-02-28 10:27:46 -05:00
362ecfe528
Merge pull request #297 from getamis/consensus_failed
...
In this PR, we fixed https://github.com/jpmorganchase/quorum/issues/289 .
The root cause is we change the block header timestamp in Seal(). It will cause different root hash in proposer and validators' side.
We did the following updates:
1. remove `BlockPauseTime`
2. set block header timestamp in Prepare()
2018-02-27 15:30:43 -05:00
f7b063302d
cmd, consensus: remove BlockPauseTime flag
2018-02-27 14:52:03 +08:00
d398d04e27
cmd/geth: fix broken links to JavaScript-Console wiki in cmd line help ( #16183 )
...
* Fixed broken link to JavaScript-Console wiki in cmd line help
* cmd/geth: Added missing r in 'JavaScript'
2018-02-26 11:38:17 +02:00
01507d9b9d
cmd, console: support all termination signals
2018-02-21 15:23:10 +02:00
de93a9d437
main: add gc flags to import-command
2018-02-15 09:16:59 +01:00
589b603a9b
rpc: dns rebind protection ( #15962 )
...
* cmd,node,rpc: add allowedHosts to prevent dns rebinding attacks
* p2p,node: Fix bug with dumpconfig introduced in r54aeb8e4c0bb9f0e7a6c67258af67df3b266af3d
* rpc: add wildcard support for rpcallowedhosts + go fmt
* cmd/geth, cmd/utils, node, rpc: ignore direct ip(v4/6) addresses in rpc virtual hostnames check
* http, rpc, utils: make vhosts into map, address review concerns
* node: change log messages to use geth standard (not sprintf)
* rpc: fix spelling
2018-02-12 14:52:07 +02:00
55599ee95d
core, trie: intermediate mempool between trie and database ( #15857 )
...
This commit reduces database I/O by not writing every state trie to disk.
2018-02-05 17:40:32 +01:00
e98cb26e9e
Make `IsQuorum: true` default but not forced.
2018-01-30 11:43:20 -05:00
1bf508b449
accounts/abi/bind: support event filtering in abigen
2018-01-24 10:54:13 +02:00
938cf4528a
dashboard: deep state update, version in footer ( #15837 )
...
* dashboard: footer, deep state update
* dashboard: resolve asset path
* dashboard: remove bundle.js
* dashboard: prevent state update on every reconnection
* dashboard: fix linter issue
* dashboard, cmd: minor UI fix, include commit hash
* remove geth binary
* dashboard: gitCommit renamed to commit
* dashboard: move the geth version to the right, make commit optional
* dashboard: commit limited to 7 characters
* dashboard: limit commit length on client side
* dashboard: run go generate
2018-01-15 11:20:00 +02:00
bd0dbfa2a8
cmd/geth: user friendly light miner error
2018-01-12 11:59:18 +02:00
413cc5b0c8
cmd/geth: remove trailing newline in license command ( #15782 )
2018-01-02 12:48:19 +01:00
1d7d7f57d0
cmd/geth: add support for geth --rinkeby attach
2017-12-15 13:31:10 -08:00
6e613cf3de
cmd/geth: add support for geth attach --testnet ( #15597 )
2017-12-05 11:17:38 +01:00
8f35e3086c
cmd/geth: fix geth attach --datadir=... ( #15517 )
2017-11-28 14:00:00 +01:00
bedf6f40af
cmd/geth: make geth account new faster with many keys ( #15529 )
2017-11-20 17:39:53 +01:00
ba62215d9e
cmd, dashboard: dashboard using React, Material-UI, Recharts ( #15393 )
...
* cmd, dashboard: dashboard using React, Material-UI, Recharts
* cmd, dashboard, metrics: initial proof of concept dashboard
* dashboard: delete blobs
* dashboard: gofmt -s -w .
* dashboard: minor text and code polishes
2017-11-14 19:34:00 +02:00
de1f72b294
Remove Quorum version insertion.
...
It resulted in "Geth/vquorum" in the console.
Instead print the Quorum version just in the version command.
2017-11-08 14:11:51 -05:00
vsmk98
amalraj.manigmail.com
Jitendra Bhurat
Anton Evangelatov
nobody
Tomoaki Tsuzuki
rjl493456442
Qvintvs
kiel barry
Péter Szilágyi
Felix Lange
Vie
Wuxiang
Zhenguo Niu
Nguyen Sy Thanh Son
Guillaume Ballet
Kurkó Mihály
Patrick Mylund Nielsen
mark.lin
Domino Valdano
Martin Holst Swende
Joel Burget
Sorin Neacsu
Sorin Neacsu
Maximilian Meister