321f7b27f8
Merge branch 'master' into feature/permissioning-1.8.18-suborgs-docs
2019-05-22 09:24:54 -04:00
bc204f148d
run goimports
2019-05-20 11:23:12 -04:00
afc9e3a967
permissions: node level validation for transactions
2019-04-17 19:16:16 +08:00
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
Samer Falah
Trung Nguyen
vsmk98
Jitendra Bhurat
amalraj.manigmail.com
gary rong
Felix Lange
Sai Valiveti
Liang ZOU
Péter Szilágyi
Angela Pratt
Peter Fox