aboutsummaryrefslogtreecommitdiffstats
path: root/miner/worker.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-09 23:20:34 +0800
committerobscuren <geffobscura@gmail.com>2015-02-10 20:04:38 +0800
commitda2fae0e437f9467a943acfe0571a8a24e8e76fd (patch)
treed760375fbcd441a6460c1ea1d7db930f78e1df20 /miner/worker.go
parentb22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e (diff)
downloadgo-tangerine-da2fae0e437f9467a943acfe0571a8a24e8e76fd.tar.gz
go-tangerine-da2fae0e437f9467a943acfe0571a8a24e8e76fd.tar.zst
go-tangerine-da2fae0e437f9467a943acfe0571a8a24e8e76fd.zip
Basic structure miner
Diffstat (limited to 'miner/worker.go')
-rw-r--r--miner/worker.go61
1 files changed, 49 insertions, 12 deletions
diff --git a/miner/worker.go b/miner/worker.go
index ea8f2e8b5..d0d085861 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -42,11 +42,15 @@ func env(block *types.Block, eth *eth.Ethereum) *environment {
}
type Agent interface {
- Comms() chan<- *types.Block
+ Work() chan<- *types.Block
+ SetNonceCh(chan<- []byte)
+ Stop()
+ Pow() pow.PoW
}
type worker struct {
- agents []chan<- *types.Block
+ agents []Agent
+ recv chan []byte
mux *event.TypeMux
quit chan struct{}
pow pow.PoW
@@ -59,24 +63,44 @@ type worker struct {
current *environment
}
-func (self *worker) register(agent chan<- *types.Block) {
+func newWorker(coinbase []byte, eth *eth.Ethereum) *worker {
+ return &worker{
+ eth: eth,
+ mux: eth.EventMux(),
+ recv: make(chan []byte),
+ chain: eth.ChainManager(),
+ proc: eth.BlockProcessor(),
+ coinbase: coinbase,
+ }
+}
+
+func (self *worker) start() {
+ go self.update()
+ go self.wait()
+}
+
+func (self *worker) stop() {
+ close(self.quit)
+}
+
+func (self *worker) register(agent Agent) {
self.agents = append(self.agents, agent)
+ agent.SetNonceCh(self.recv)
}
func (self *worker) update() {
- events := self.mux.Subscribe(core.NewBlockEvent{}, core.TxPreEvent{}, &LocalTx{})
+ events := self.mux.Subscribe(core.ChainEvent{}, core.TxPreEvent{})
out:
for {
select {
case event := <-events.Chan():
switch event := event.(type) {
- case core.NewBlockEvent:
- if self.eth.ChainManager().HasBlock(event.Block.Hash()) {
- }
+ case core.ChainEvent:
+ self.commitNewWork()
case core.TxPreEvent:
if err := self.commitTransaction(event.Tx); err != nil {
- self.commit()
+ self.push()
}
}
case <-self.quit:
@@ -85,12 +109,24 @@ out:
}
}
-func (self *worker) commit() {
+func (self *worker) wait() {
+ for {
+ for nonce := range self.recv {
+ self.current.block.Header().Nonce = nonce
+ fmt.Println(self.current.block)
+
+ self.chain.InsertChain(types.Blocks{self.current.block})
+ break
+ }
+ }
+}
+
+func (self *worker) push() {
self.current.state.Update(ethutil.Big0)
self.current.block.SetRoot(self.current.state.Root())
for _, agent := range self.agents {
- agent <- self.current.block
+ agent.Work() <- self.current.block
}
}
@@ -110,7 +146,8 @@ func (self *worker) commitNewWork() {
case core.IsNonceErr(err):
remove = append(remove, tx)
case core.IsGasLimitErr(err):
- // ignore
+ // Break on gas limit
+ break
default:
minerlogger.Infoln(err)
remove = append(remove, tx)
@@ -120,7 +157,7 @@ func (self *worker) commitNewWork() {
self.current.coinbase.AddAmount(core.BlockReward)
- self.commit()
+ self.push()
}
var (