diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-09 23:20:34 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-10 20:04:38 +0800 |
| commit | da2fae0e437f9467a943acfe0571a8a24e8e76fd (patch) | |
| tree | d760375fbcd441a6460c1ea1d7db930f78e1df20 /cmd | |
| parent | b22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e (diff) | |
| download | dexon-da2fae0e437f9467a943acfe0571a8a24e8e76fd.tar.gz dexon-da2fae0e437f9467a943acfe0571a8a24e8e76fd.tar.zst dexon-da2fae0e437f9467a943acfe0571a8a24e8e76fd.zip | |
Basic structure miner
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mist/gui.go | 2 | ||||
| -rw-r--r-- | cmd/mist/ui_lib.go | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index edc799abc..fdd823171 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -455,7 +455,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 diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 7c5802076..3b9e35c1b 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -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) { |