tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added removal off erroneous txs. Fixed pipeline

Browse Source
This commit is contained in:
obscuren 2014-10-27 17:02:31 +01:00
parent cbc6709937
commit 10782c5aae
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ethminer/miner.go
View File

@ -81,18 +81,19 @@ func (miner *Miner) Stop() {
} }
func (miner *Miner) listener() { func (miner *Miner) listener() {
for { miner.startMining()
miner.startMining()
for {
select { select {
case event, isopen := <-miner.events.Chan(): case event, isopen := <-miner.events.Chan():
miner.stopMining()
if !isopen { if !isopen {
return return
} }
switch event := event.(type) { switch event := event.(type) {
case ethchain.NewBlockEvent: case ethchain.NewBlockEvent:
miner.stopMining()
block := event.Block block := event.Block
//logger.Infoln("Got new block via Reactor") //logger.Infoln("Got new block via Reactor")
if bytes.Compare(miner.ethereum.ChainManager().CurrentBlock.Hash(), block.Hash()) == 0 { if bytes.Compare(miner.ethereum.ChainManager().CurrentBlock.Hash(), block.Hash()) == 0 {
@ -126,6 +127,8 @@ func (miner *Miner) listener() {
case ethchain.TxEvent: case ethchain.TxEvent:
if event.Type == ethchain.TxPre { if event.Type == ethchain.TxPre {
miner.stopMining()
found := false found := false
for _, ctx := range miner.txs { for _, ctx := range miner.txs {
if found = bytes.Compare(ctx.Hash(), event.Tx.Hash()) == 0; found { if found = bytes.Compare(ctx.Hash(), event.Tx.Hash()) == 0; found {
@ -142,7 +145,7 @@ func (miner *Miner) listener() {
} }
case <-miner.powDone: case <-miner.powDone:
// next iteration will start mining again miner.startMining()
} }
} }
} }
@ -178,10 +181,11 @@ func (self *Miner) mineNewBlock() {
parent := self.ethereum.ChainManager().GetBlock(self.block.PrevHash) parent := self.ethereum.ChainManager().GetBlock(self.block.PrevHash)
coinbase := self.block.State().GetOrNewStateObject(self.block.Coinbase) coinbase := self.block.State().GetOrNewStateObject(self.block.Coinbase)
coinbase.SetGasPool(self.block.CalcGasLimit(parent)) coinbase.SetGasPool(self.block.CalcGasLimit(parent))
receipts, txs, unhandledTxs, err := stateManager.ProcessTransactions(coinbase, self.block.State(), self.block, self.block, self.txs) receipts, txs, unhandledTxs, erroneous, err := stateManager.ProcessTransactions(coinbase, self.block.State(), self.block, self.block, self.txs)
if err != nil { if err != nil {
logger.Debugln(err) logger.Debugln(err)
} }
self.ethereum.TxPool().RemoveSet(erroneous)
self.txs = append(txs, unhandledTxs...) self.txs = append(txs, unhandledTxs...)
self.block.SetTxHash(receipts) self.block.SetTxHash(receipts)