aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-06-15 17:33:08 +0800
committerobscuren <geffobscura@gmail.com>2015-06-15 17:33:08 +0800
commit6d817e16c1c17f7cad4a34fa91457e21f63f2de4 (patch)
treefad58ed95ee70bcee2766347148eb25b27382122 /miner
parent6f5c6150b7060b6b2ee68ac95b30f46c5c2c7f90 (diff)
downloaddexon-6d817e16c1c17f7cad4a34fa91457e21f63f2de4.tar.gz
dexon-6d817e16c1c17f7cad4a34fa91457e21f63f2de4.tar.zst
dexon-6d817e16c1c17f7cad4a34fa91457e21f63f2de4.zip
core, miner: tx pool drops txs below ask price
Diffstat (limited to 'miner')
-rw-r--r--miner/miner.go2
-rw-r--r--miner/worker.go7
2 files changed, 6 insertions, 3 deletions
diff --git a/miner/miner.go b/miner/miner.go
index 20ca81648..7f73f3ee8 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -77,7 +77,7 @@ func (m *Miner) SetGasPrice(price *big.Int) {
return
}
- m.worker.gasPrice = price
+ m.worker.setGasPrice(price)
}
func (self *Miner) Start(coinbase common.Address, threads int) {
diff --git a/miner/worker.go b/miner/worker.go
index bd4bc0e3c..d339507ca 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -6,6 +6,7 @@ import (
"sort"
"sync"
"sync/atomic"
+ "time"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
@@ -374,6 +375,8 @@ func (self *worker) commitNewWork() {
self.currentMu.Lock()
defer self.currentMu.Unlock()
+ tstart := time.Now()
+
previous := self.current
self.makeCurrent()
current := self.current
@@ -409,7 +412,7 @@ func (self *worker) commitNewWork() {
// We only care about logging if we're actually mining
if atomic.LoadInt32(&self.mining) == 1 {
- glog.V(logger.Info).Infof("commit new work on block %v with %d txs & %d uncles\n", current.block.Number(), current.tcount, len(uncles))
+ glog.V(logger.Info).Infof("commit new work on block %v with %d txs & %d uncles. Took %v\n", current.block.Number(), current.tcount, len(uncles), time.Since(tstart))
self.logLocalMinedBlocks(previous)
}
@@ -437,7 +440,6 @@ func (self *worker) commitUncle(uncle *types.Header) error {
// Error not unique
return core.UncleError("Uncle not unique")
}
- self.current.uncles.Add(uncle.Hash())
if !self.current.ancestors.Has(uncle.ParentHash) {
return core.UncleError(fmt.Sprintf("Uncle's parent unknown (%x)", uncle.ParentHash[0:4]))
@@ -446,6 +448,7 @@ func (self *worker) commitUncle(uncle *types.Header) error {
if self.current.family.Has(uncle.Hash()) {
return core.UncleError(fmt.Sprintf("Uncle already in family (%x)", uncle.Hash()))
}
+ self.current.uncles.Add(uncle.Hash())
return nil
}