9dbafd38c5
Adding a lock around WriteBlockWithState while processing sealing result
2019-04-16 15:23:42 -04:00
73667e7942
merge 1.8.18 with quorum/master
...
refactor raft & istanbul based on upstream changes
fix unit test cases
2019-02-08 17:29:01 +08:00
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
13a9f26f9a
Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16
2018-11-29 17:56:02 +08:00
519337a9d0
Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16
2018-11-29 16:57:27 +08:00
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
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
e2640a96d4
miner: fix miner stress test ( #18039 )
2018-11-07 10:55:56 +02:00
a3ec05d471
Writing private block bloom for miner
2018-10-19 09:56:48 -04:00
459278cd57
miner: remove intermediate conversion to int in tests ( #17853 )
...
This fixes the tests on 32bit platforms.
2018-10-08 16:30:00 +02:00
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
8c2a8ab32a
reverted some changes
2018-10-08 06:29:11 +00:00
dc116850b4
miner, istanbul/backend : make seal async
2018-10-05 15:28:50 +08:00
9ab2f224d9
Node crash issue fix
2018-10-05 14:59:20 +08:00
2c4081d89f
Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new
...
fix compilation issues on programs impcted by this merge
2018-10-04 16:21:20 +08:00
47571689ee
Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new
...
# Conflicts:
# .travis.yml
# README.md
# cmd/utils/flags.go
# consensus/consensus.go
# consensus/ethash/consensus.go
# consensus/ethash/ethash.go
# core/blockchain.go
# core/genesis_test.go
# core/state/state_object.go
# core/state_processor.go
# core/vm/errors.go
# core/vm/evm.go
# core/vm/gas_table.go
# core/vm/instructions_test.go
# core/vm/interface.go
# eth/api_tracer.go
# eth/backend.go
# eth/config.go
# eth/filters/filter.go
# les/backend.go
# les/helper_test.go
# miner/worker.go
# params/config.go
# params/version.go
2018-10-04 16:19:02 +08: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
8d3f8bb3d5
Raft: private state tridb commit added
2018-09-27 07:30:00 +00:00
6663e5da10
all: fix various comment typos ( #17748 )
2018-09-25 12:26:35 +02:00
457e930f27
eth, miner: prefer locally generated uncles vs remote ones ( #17715 )
...
* core, eth: fix dependency cycle
* eth, miner: perfer to locally generated uncle
2018-09-21 00:11:55 +03:00
d6254f827b
all: protect self-mined block during reorg ( #17656 )
2018-09-20 15:09:30 +03:00
4bb25042eb
consensus/clique, core: chain maker clique + error tests
2018-09-11 16:40:00 +03:00
d98f0fce0d
enable clique poa consensus
2018-09-05 09:49:53 -04:00
f0242ee76d
miner: keep the timestamp for resubmitted mining block ( #17547 )
2018-08-29 17:31:59 +03:00
a4bc2c31e1
Merge pull request #17540 from karalabe/miner-uncle-fix
...
miner: track uncles more aggressively
2018-08-29 13:59:15 +03:00
f751c6ed47
miner: track uncles more aggressively
2018-08-29 13:29:59 +03:00
e8f229b82e
cmd, core, eth, miner, params: configurable gas floor and ceil
2018-08-29 12:40:12 +03:00
c1c003e4ff
consensus, miner: stale block mining support ( #17506 )
...
* consensus, miner: stale block supporting
* consensus, miner: refactor seal signature
* cmd, consensus, eth: add miner noverify flag
* cmd, consensus, miner: polish
2018-08-28 16:59:05 +03:00
c134e00e48
Merge pull request #17494 from karalabe/mined-block-uncle-check
...
miner: differentiate between uncle and lost block
2018-08-23 16:03:10 +03:00
40a71f28cf
miner: fix state commit, track old work packages too ( #17490 )
...
* miner: commit state which is relative with sealing result
* consensus, core, miner, mobile: introduce sealHash interface
* miner: evict pending task with threshold
* miner: go fmt
2018-08-23 16:02:57 +03:00
1136269a79
miner: differentiate between uncle and lost block
2018-08-23 15:44:27 +03:00
1e63a015a5
miner: add two stress tests based on clique and ethash
2018-08-23 14:09:45 +03:00
e0d0e64ce2
cmd, core, miner: add --txpool.locals and priority mining
2018-08-22 09:43:57 +03:00
b2c644ffb5
cmd, eth, miner: make recommit configurable ( #17444 )
...
* cmd, eth, miner: make recommit configurable
* cmd, eth, les, miner: polish a bit
* miner: filter duplicate sealing work
* cmd: remove uncessary conversion
* miner: avoid microptimization in favor of cleaner code
2018-08-21 22:56:54 +03:00
a063fe9b2d
miner: fix uncle iteration logic ( #17469 )
2018-08-21 17:33:04 +03:00
22cd3f70a6
miner: update mining log with correct fee calculation
2018-08-17 15:47:14 +03:00
62f5137a72
miner: add gas and fee details to mining logs
2018-08-16 14:49:00 +03:00
54216811a0
miner: regenerate mining work every 3 seconds ( #17413 )
...
* miner: regenerate mining work every 3 seconds
* miner: polish
2018-08-16 14:14:33 +03:00
9cf76b8aef
Merge remote-tracking branch 'remotes/upstream/master' into merge-1812-updated
2018-08-16 17:12:01 +08:00
040aa2bb10
miner: streaming uncle blocks ( #17320 )
...
* miner: stream uncle block
* miner: polish
2018-08-15 14:09:17 +03:00
a1783d1697
miner: move agent logic to worker ( #17351 )
...
* miner: move agent logic to worker
* miner: polish
* core: persist block before reorg
2018-08-14 18:34:33 +03:00
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
95a1b03c3e
merge 1.8.12 with upstream/master to apply the fixes/changes added newly
2018-08-06 19:03:51 +08:00
e6773756fb
merge 1.8.12 with upstream/master to apply the fixes/changes added newly
2018-08-06 19:03:51 +08:00
941018b570
miner: seperate state, receipts for different mining work ( #17323 )
2018-08-06 12:55:44 +03:00
51db5975cc
consensus/ethash: move remote agent logic to ethash internal ( #15853 )
...
* consensus/ethash: start remote ggoroutine to handle remote mining
* consensus/ethash: expose remote miner api
* consensus/ethash: expose submitHashrate api
* miner, ethash: push empty block to sealer without waiting execution
* consensus, internal: add getHashrate API for ethash
* consensus: add three method for consensus interface
* miner: expose consensus engine running status to miner
* eth, miner: specify etherbase when miner created
* miner: commit new work when consensus engine is started
* consensus, miner: fix some logics
* all: delete useless interfaces
* consensus: polish a bit
2018-08-03 11:33:37 +03:00
228a7d93d6
Istanbul events not firing & logs not showing on some nodes ( #460 )
...
* keep merging of public and private receipts inline with other processing flows
* added private state prepare in commitTransaction for missed private events
2018-08-01 10:06:47 -04:00
2fbc454355
miner: fix state locking while writing to chain (issue #16933 ) ( #17173 )
2018-07-31 10:22:33 +03:00
f97be18238
miner: restore Handle ChainHeadEvent change specific to quorum from previous quorum version
2018-07-26 18:50:10 +08: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
Jitendra Bhurat
amalraj.manigmail.com
gary rong
Felix Lange
vsmk98
Sai Valiveti
Liang ZOU
Péter Szilágyi
Angela Pratt
Peter Fox
ledgerwatch