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

adapt miner to new backend. use events to broadcast new mined blocks

Browse Source
This commit is contained in:
zelig 2014-12-14 18:10:48 +00:00
parent 148de1c875
commit 118862f1ba
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
miner/miner.go
View File

@ -27,7 +27,7 @@ import (
"math/big" "math/big"
"sort" "sort"
"github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/pow/ezp" "github.com/ethereum/go-ethereum/pow/ezp"
@ -36,7 +36,6 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/wire"
) )
type LocalTx struct { type LocalTx struct {
@ -217,7 +216,7 @@ func (self *Miner) mine() {
if err != nil { if err != nil {
minerlogger.Infoln(err) minerlogger.Infoln(err)
} else { } else {
self.eth.Broadcast(wire.MsgBlockTy, []interface{}{block.Value().Val}) self.eth.EventMux().Post(core.NewMinedBlockEvent{block})
minerlogger.Infof("🔨 Mined block %x\n", block.Hash()) minerlogger.Infof("🔨 Mined block %x\n", block.Hash())
minerlogger.Infoln(block) minerlogger.Infoln(block)
@ -246,7 +245,7 @@ func (self *Miner) finiliseTxs() types.Transactions {
} }
// Faster than append // Faster than append
for _, tx := range self.eth.TxPool().CurrentTransactions() { for _, tx := range self.eth.TxPool().GetTransactions() {
if tx.GasPrice.Cmp(self.MinAcceptedGasPrice) >= 0 { if tx.GasPrice.Cmp(self.MinAcceptedGasPrice) >= 0 {
txs[actualSize] = tx txs[actualSize] = tx
actualSize++ actualSize++