gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

"centralised" mining to backend. Closes #323

Browse Source
This commit is contained in:
obscuren
2015-02-17 12:24:51 +01:00
parent 164de5e22b
commit 8135752a32
11 changed files with 47 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
miner/miner.go
View File

@ -3,7 +3,7 @@ package miner
import (
"math/big"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/pow/ezp"
)
@ -16,13 +16,13 @@ type Miner struct {
MinAcceptedGasPrice *big.Int
Extra string
coinbase []byte
Coinbase []byte
mining bool
}
func New(coinbase []byte, eth *eth.Ethereum) *Miner {
func New(coinbase []byte, eth core.Backend) *Miner {
miner := &Miner{
coinbase: coinbase,
Coinbase: coinbase,
worker: newWorker(coinbase, eth),
}

7
miner/worker.go
View File

@ -8,7 +8,6 @@ import (
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/pow"
@ -25,7 +24,7 @@ type environment struct {
uncles *set.Set
}
func env(block *types.Block, eth *eth.Ethereum) *environment {
func env(block *types.Block, eth core.Backend) *environment {
state := state.New(block.Root(), eth.Db())
env := &environment{
totalUsedGas: new(big.Int),
@ -63,7 +62,7 @@ type worker struct {
quit chan struct{}
pow pow.PoW
eth *eth.Ethereum
eth core.Backend
chain *core.ChainManager
proc *core.BlockProcessor
coinbase []byte
@ -73,7 +72,7 @@ type worker struct {
mining bool
}
func newWorker(coinbase []byte, eth *eth.Ethereum) *worker {
func newWorker(coinbase []byte, eth core.Backend) *worker {
return &worker{
eth: eth,
mux: eth.EventMux(),