status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miner' into develop

This commit is contained in:
obscuren 2015-02-13 17:23:18 +01:00
parent 5c251b6928 8a0f23915e
commit 00fca40939
13 changed files with 240 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/mist/assets/examples/coin.html
View File

@ -117,7 +117,6 @@
refresh();
</script>
</html>
<!--

4
cmd/mist/assets/qml/main.qml
View File

@ -289,6 +289,7 @@ ApplicationWindow {
styleColor: "#797979"
}
/*
Label {
//y: 6
objectName: "miningLabel"
@ -307,6 +308,7 @@ ApplicationWindow {
anchors.right: peerGroup.left
anchors.rightMargin: 5
}
*/
ProgressBar {
visible: false
@ -1101,4 +1103,4 @@ ApplicationWindow {
addrField.focus = true
}
}
}
}

24
cmd/mist/assets/qml/views/miner.qml
View File

@ -14,6 +14,30 @@ Rectangle {
color: "#00000000"
Label {
visible: false
id: lastBlockLabel
objectName: "lastBlockLabel"
text: "---"
font.pixelSize: 10
anchors.right: peerGroup.left
anchors.rightMargin: 5
onTextChanged: {
//menuItem.secondaryTitle = text
}
}
Label {
objectName: "miningLabel"
visible: false
font.pixelSize: 10
anchors.right: lastBlockLabel.left
anchors.rightMargin: 5
onTextChanged: {
menuItem.secondaryTitle = text
}
}
ColumnLayout {
spacing: 10
anchors.fill: parent

2
cmd/mist/gui.go
View File

@ -452,7 +452,7 @@ func (gui *Gui) update() {
case <-generalUpdateTicker.C:
statusText := "#" + gui.eth.ChainManager().CurrentBlock().Number().String()
lastBlockLabel.Set("text", statusText)
miningLabel.Set("text", "Mining @ "+strconv.FormatInt(gui.uiLib.miner.GetPow().GetHashrate(), 10)+"Khash")
miningLabel.Set("text", "Mining @ "+strconv.FormatInt(gui.uiLib.miner.HashRate(), 10)+"/Khash")
/*
blockLength := gui.eth.BlockPool().BlocksProcessed

19
cmd/mist/ui_lib.go
View File

@ -209,17 +209,20 @@ func (self *UiLib) Call(params map[string]interface{}) (string, error) {
}
func (self *UiLib) AddLocalTransaction(to, data, gas, gasPrice, value string) int {
return self.miner.AddLocalTx(&miner.LocalTx{
To: ethutil.Hex2Bytes(to),
Data: ethutil.Hex2Bytes(data),
Gas: gas,
GasPrice: gasPrice,
Value: value,
}) - 1
return 0
/*
return self.miner.AddLocalTx(&miner.LocalTx{
To: ethutil.Hex2Bytes(to),
Data: ethutil.Hex2Bytes(data),
Gas: gas,
GasPrice: gasPrice,
Value: value,
}) - 1
*/
}
func (self *UiLib) RemoveLocalTransaction(id int) {
self.miner.RemoveLocalTx(id)
//self.miner.RemoveLocalTx(id)
}
func (self *UiLib) SetGasPrice(price string) {

5
core/block_processor.go
View File

@ -48,8 +48,9 @@ type BlockProcessor struct {
func NewBlockProcessor(db ethutil.Database, txpool *TxPool, chainManager *ChainManager, eventMux *event.TypeMux) *BlockProcessor {
sm := &BlockProcessor{
db: db,
mem: make(map[string]*big.Int),
db: db,
mem: make(map[string]*big.Int),
//Pow: &ethash.Ethash{},
Pow: ezp.New(),
bc: chainManager,
eventMux: eventMux,

11
core/chain_manager.go
View File

@ -16,6 +16,11 @@ import (
var chainlogger = logger.NewLogger("CHAIN")
type ChainEvent struct {
Block *types.Block
Td *big.Int
}
type StateQuery interface {
GetAccount(addr []byte) *state.StateObject
}
@ -175,6 +180,9 @@ func (bc *ChainManager) NewBlock(coinbase []byte) *types.Block {
ethutil.BigPow(2, 32),
nil,
"")
block.SetUncles(nil)
block.SetTransactions(nil)
block.SetReceipts(nil)
parent := bc.currentBlock
if parent != nil {
@ -385,8 +393,9 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
self.setTotalDifficulty(td)
self.insert(block)
self.transState = state.New(cblock.Root(), self.db) //state.New(cblock.Trie().Copy())
}
self.eventMux.Post(ChainEvent{block, td})
}
}
self.mu.Unlock()

73
miner/agent.go Normal file
View File

@ -0,0 +1,73 @@
package miner
import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/pow"
)
type CpuMiner struct {
c chan *types.Block
quit chan struct{}
quitCurrentOp chan struct{}
returnCh chan<- Work
index int
pow pow.PoW
}
func NewCpuMiner(index int, pow pow.PoW) *CpuMiner {
miner := &CpuMiner{
c: make(chan *types.Block, 1),
quit: make(chan struct{}),
quitCurrentOp: make(chan struct{}, 1),
pow: pow,
index: index,
}
go miner.update()
return miner
}
func (self *CpuMiner) Work() chan<- *types.Block { return self.c }
func (self *CpuMiner) Pow() pow.PoW { return self.pow }
func (self *CpuMiner) SetNonceCh(ch chan<- Work) { self.returnCh = ch }
func (self *CpuMiner) Stop() {
close(self.quit)
close(self.quitCurrentOp)
}
func (self *CpuMiner) update() {
out:
for {
select {
case block := <-self.c:
// make sure it's open
self.quitCurrentOp <- struct{}{}
go self.mine(block)
case <-self.quit:
break out
}
}
done:
// Empty channel
for {
select {
case <-self.c:
default:
close(self.c)
break done
}
}
}
func (self *CpuMiner) mine(block *types.Block) {
minerlogger.Infof("(re)started agent[%d]. mining...\n", self.index)
nonce := self.pow.Search(block, self.quitCurrentOp)
if nonce != nil {
self.returnCh <- Work{block.Number().Uint64(), nonce}
}
}

254
miner/miner.go
View File

@ -1,263 +1,61 @@
/*
This file is part of go-ethereum
go-ethereum is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
go-ethereum is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @authors
* Jeffrey Wilcke <i@jev.io>
* @date 2014
*
*/
package miner
import (
"math/big"
"sort"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/pow/ezp"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/pow/ezp"
)
type LocalTx struct {
To []byte `json:"to"`
Data []byte `json:"data"`
Gas string `json:"gas"`
GasPrice string `json:"gasPrice"`
Value string `json:"value"`
}
func (self *LocalTx) Sign(key []byte) *types.Transaction {
return nil
}
var minerlogger = logger.NewLogger("MINER")
type Miner struct {
eth *eth.Ethereum
events event.Subscription
uncles []*types.Header
localTxs map[int]*LocalTx
localTxId int
pow pow.PoW
quitCh chan struct{}
powQuitCh chan struct{}
Coinbase []byte
mining bool
worker *worker
MinAcceptedGasPrice *big.Int
Extra string
coinbase []byte
mining bool
}
func New(coinbase []byte, eth *eth.Ethereum) *Miner {
return &Miner{
eth: eth,
powQuitCh: make(chan struct{}),
pow: ezp.New(),
mining: false,
localTxs: make(map[int]*LocalTx),
MinAcceptedGasPrice: big.NewInt(10000000000000),
Coinbase: coinbase,
}
}
func (self *Miner) GetPow() pow.PoW {
return self.pow
}
func (self *Miner) AddLocalTx(tx *LocalTx) int {
minerlogger.Infof("Added local tx (%x %v / %v)\n", tx.To[0:4], tx.GasPrice, tx.Value)
self.localTxId++
self.localTxs[self.localTxId] = tx
self.eth.EventMux().Post(tx)
return self.localTxId
}
func (self *Miner) RemoveLocalTx(id int) {
if tx := self.localTxs[id]; tx != nil {
minerlogger.Infof("Removed local tx (%x %v / %v)\n", tx.To[0:4], tx.GasPrice, tx.Value)
}
self.eth.EventMux().Post(&LocalTx{})
delete(self.localTxs, id)
}
func (self *Miner) Start() {
if self.mining {
return
miner := &Miner{
coinbase: coinbase,
worker: newWorker(coinbase, eth),
}
minerlogger.Infoln("Starting mining operations")
self.mining = true
self.quitCh = make(chan struct{})
self.powQuitCh = make(chan struct{})
mux := self.eth.EventMux()
self.events = mux.Subscribe(core.NewBlockEvent{}, core.TxPreEvent{}, &LocalTx{})
go self.update()
go self.mine()
}
func (self *Miner) Stop() {
if !self.mining {
return
for i := 0; i < 4; i++ {
miner.worker.register(NewCpuMiner(i, ezp.New()))
}
self.mining = false
minerlogger.Infoln("Stopping mining operations")
self.events.Unsubscribe()
close(self.quitCh)
close(self.powQuitCh)
return miner
}
func (self *Miner) Mining() bool {
return self.mining
}
func (self *Miner) update() {
out:
for {
select {
case event := <-self.events.Chan():
switch event := event.(type) {
case core.NewBlockEvent:
block := event.Block
if self.eth.ChainManager().HasBlock(block.Hash()) {
self.reset()
self.eth.TxPool().RemoveSet(block.Transactions())
go self.mine()
} else if true {
// do uncle stuff
}
case core.TxPreEvent, *LocalTx:
self.reset()
go self.mine()
}
case <-self.quitCh:
break out
}
}
func (self *Miner) Start() {
self.mining = true
self.worker.start()
self.worker.commitNewWork()
}
func (self *Miner) reset() {
close(self.powQuitCh)
self.powQuitCh = make(chan struct{})
func (self *Miner) Stop() {
self.mining = false
self.worker.stop()
}
func (self *Miner) mine() {
var (
blockProcessor = self.eth.BlockProcessor()
chainMan = self.eth.ChainManager()
block = chainMan.NewBlock(self.Coinbase)
state = state.New(block.Root(), self.eth.Db())
)
block.Header().Extra = self.Extra
// Apply uncles
block.SetUncles(self.uncles)
parent := chainMan.GetBlock(block.ParentHash())
coinbase := state.GetOrNewStateObject(block.Coinbase())
coinbase.SetGasPool(core.CalcGasLimit(parent, block))
transactions := self.finiliseTxs()
// Accumulate all valid transactions and apply them to the new state
// Error may be ignored. It's not important during mining
receipts, txs, _, erroneous, err := blockProcessor.ApplyTransactions(coinbase, state, block, transactions, true)
if err != nil {
minerlogger.Debugln(err)
func (self *Miner) HashRate() int64 {
var tot int64
for _, agent := range self.worker.agents {
tot += agent.Pow().GetHashrate()
}
self.eth.TxPool().RemoveSet(erroneous)
block.SetTransactions(txs)
block.SetReceipts(receipts)
// Accumulate the rewards included for this block
blockProcessor.AccumulateRewards(state, block, parent)
state.Update(ethutil.Big0)
block.SetRoot(state.Root())
minerlogger.Infof("Mining on block. Includes %v transactions", len(transactions))
// Find a valid nonce
nonce := self.pow.Search(block, self.powQuitCh)
if nonce != nil {
block.Header().Nonce = nonce
err := chainMan.InsertChain(types.Blocks{block})
if err != nil {
minerlogger.Infoln(err)
} else {
self.eth.EventMux().Post(core.NewMinedBlockEvent{block})
minerlogger.Infof("🔨 Mined block %x\n", block.Hash())
minerlogger.Infoln(block)
}
go self.mine()
}
}
func (self *Miner) finiliseTxs() types.Transactions {
// Sort the transactions by nonce in case of odd network propagation
actualSize := len(self.localTxs) // See copy below
txs := make(types.Transactions, actualSize+self.eth.TxPool().Size())
state := self.eth.ChainManager().TransState()
// XXX This has to change. Coinbase is, for new, same as key.
key := self.eth.KeyManager()
for i, ltx := range self.localTxs {
tx := types.NewTransactionMessage(ltx.To, ethutil.Big(ltx.Value), ethutil.Big(ltx.Gas), ethutil.Big(ltx.GasPrice), ltx.Data)
tx.SetNonce(state.GetNonce(self.Coinbase))
state.SetNonce(self.Coinbase, tx.Nonce()+1)
tx.Sign(key.PrivateKey())
txs[i] = tx
}
// Faster than append
for _, tx := range self.eth.TxPool().GetTransactions() {
if tx.GasPrice().Cmp(self.MinAcceptedGasPrice) >= 0 {
txs[actualSize] = tx
actualSize++
}
}
newTransactions := make(types.Transactions, actualSize)
copy(newTransactions, txs[:actualSize])
sort.Sort(types.TxByNonce{newTransactions})
return newTransactions
return tot
}

85
miner/worker.go
View File

@ -41,12 +41,21 @@ func env(block *types.Block, eth *eth.Ethereum) *environment {
return env
}
type Work struct {
Number uint64
Nonce []byte
}
type Agent interface {
Comms() chan<- *types.Block
Work() chan<- *types.Block
SetNonceCh(chan<- Work)
Stop()
Pow() pow.PoW
}
type worker struct {
agents []chan<- *types.Block
agents []Agent
recv chan Work
mux *event.TypeMux
quit chan struct{}
pow pow.PoW
@ -57,40 +66,85 @@ type worker struct {
coinbase []byte
current *environment
mining bool
}
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 Work),
chain: eth.ChainManager(),
proc: eth.BlockProcessor(),
coinbase: coinbase,
}
}
func (self *worker) start() {
self.mining = true
self.quit = make(chan struct{})
go self.update()
go self.wait()
}
func (self *worker) stop() {
self.mining = false
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:
break out
}
}
events.Unsubscribe()
}
func (self *worker) commit() {
self.current.state.Update(ethutil.Big0)
self.current.block.SetRoot(self.current.state.Root())
func (self *worker) wait() {
for {
for work := range self.recv {
if self.current.block.Number().Uint64() == work.Number {
self.current.block.Header().Nonce = work.Nonce
for _, agent := range self.agents {
agent <- self.current.block
self.chain.InsertChain(types.Blocks{self.current.block})
}
break
}
}
}
func (self *worker) push() {
if self.mining {
self.current.state.Update(ethutil.Big0)
self.current.block.SetRoot(self.current.state.Root())
for _, agent := range self.agents {
agent.Work() <- self.current.block
}
}
}
@ -110,7 +164,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 +175,7 @@ func (self *worker) commitNewWork() {
self.current.coinbase.AddAmount(core.BlockReward)
self.commit()
self.push()
}
var (

1
pow/block.go
View File

@ -6,4 +6,5 @@ type Block interface {
Difficulty() *big.Int
HashNoNonce() []byte
N() []byte
Number() *big.Int
}

29
pow/ezp/pow.go
View File

@ -21,7 +21,7 @@ type EasyPow struct {
}
func New() *EasyPow {
return &EasyPow{turbo: false}
return &EasyPow{turbo: true}
}
func (pow *EasyPow) GetHashrate() int64 {
@ -36,26 +36,33 @@ func (pow *EasyPow) Search(block pow.Block, stop <-chan struct{}) []byte {
r := rand.New(rand.NewSource(time.Now().UnixNano()))
hash := block.HashNoNonce()
diff := block.Difficulty()
i := int64(0)
//i := int64(0)
// TODO fix offset
i := rand.Int63()
starti := i
start := time.Now().UnixNano()
t := time.Now()
// Make sure stop is empty
empty:
for {
select {
case <-stop:
default:
break empty
}
}
for {
select {
case <-stop:
powlogger.Infoln("Breaking from mining")
pow.HashRate = 0
return nil
default:
i++
if time.Since(t) > (1 * time.Second) {
elapsed := time.Now().UnixNano() - start
hashes := ((float64(1e9) / float64(elapsed)) * float64(i)) / 1000
pow.HashRate = int64(hashes)
t = time.Now()
}
elapsed := time.Now().UnixNano() - start
hashes := ((float64(1e9) / float64(elapsed)) * float64(i-starti)) / 1000
pow.HashRate = int64(hashes)
sha := crypto.Sha3(big.NewInt(r.Int63()).Bytes())
if verify(hash, diff, sha) {

1
xeth/types.go
View File

@ -60,7 +60,6 @@ func (self *Object) Storage() (storage map[string]string) {
rlp.Decode(bytes.NewReader(it.Value), &data)
storage[toHex(it.Key)] = toHex(data)
}
self.StateObject.Trie().PrintRoot()
return
}