diff options
| author | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
|---|---|---|
| committer | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
| commit | a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5 (patch) | |
| tree | 6c16d3e2b216fdf0027a477a8975c9052930e34a /miner/miner.go | |
| parent | 1fe70a66ba2ef0f148affa7a72b4e65023474859 (diff) | |
| parent | 5176fbc6faaa5e7f0305ad7f2b896c092781deaa (diff) | |
| download | go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.gz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.bz2 go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.lz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.xz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.zst go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Conflicts:
rpc/jeth.go
Diffstat (limited to 'miner/miner.go')
| -rw-r--r-- | miner/miner.go | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/miner/miner.go b/miner/miner.go index bff0026dc..efe6d3051 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -7,6 +7,8 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/pow" ) @@ -37,7 +39,18 @@ func (self *Miner) Mining() bool { return self.mining } +func (m *Miner) SetGasPrice(price *big.Int) { + // FIXME block tests set a nil gas price. Quick dirty fix + if price == nil { + return + } + + m.worker.gasPrice = price +} + func (self *Miner) Start(coinbase common.Address) { + glog.V(logger.Info).Infoln("Starting mining operation") + self.mining = true self.worker.coinbase = coinbase self.worker.start() |