diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-18 20:39:01 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-18 20:39:01 +0800 |
| commit | d15f90645d5b2e90c441140972d9fe6ecd753643 (patch) | |
| tree | b1f024c3c01f25b67bc25ed0452a9b584dad984f /miner/miner.go | |
| parent | a59dd393e71cc52b1f96973aef884af619166f38 (diff) | |
| parent | 0a1eeca41e6ba5920ba65d9b41654768299bc7e3 (diff) | |
| download | dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.gz dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.bz2 dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.lz dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.xz dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.zst dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'miner/miner.go')
| -rw-r--r-- | miner/miner.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/miner/miner.go b/miner/miner.go index 7bf67a6ec..ccc19c754 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -4,6 +4,7 @@ import ( "math/big" "github.com/ethereum/ethash" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/pow" @@ -32,7 +33,7 @@ func (self *Miner) Mining() bool { return self.mining } -func (self *Miner) Start(coinbase []byte) { +func (self *Miner) Start(coinbase common.Address) { self.mining = true self.worker = newWorker(coinbase, self.eth) self.worker.register(NewCpuMiner(0, self.pow)) |