aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/mist')
-rw-r--r--cmd/mist/assets/qml/views/miner.qml58
-rw-r--r--cmd/mist/assets/qml/views/network.qml1
-rw-r--r--cmd/mist/ui_lib.go18
3 files changed, 33 insertions, 44 deletions
diff --git a/cmd/mist/assets/qml/views/miner.qml b/cmd/mist/assets/qml/views/miner.qml
index 4025ff485..ff2bf85ca 100644
--- a/cmd/mist/assets/qml/views/miner.qml
+++ b/cmd/mist/assets/qml/views/miner.qml
@@ -55,8 +55,8 @@ Rectangle {
Button {
text: "Start"
onClicked: {
- eth.setGasPrice(minGasPrice.text || "10000000000000");
- eth.setExtra(blockExtra.text)
+ // eth.setGasPrice(minGasPrice.text || "10000000000000");
+ // eth.setExtra(blockExtra.text)
if (eth.toggleMining()) {
this.text = "Stop";
} else {
@@ -65,35 +65,35 @@ Rectangle {
}
}
- Rectangle {
- id: minGasPriceRect
- anchors.top: parent.top
- anchors.topMargin: 2
- width: 200
- TextField {
- id: minGasPrice
- placeholderText: "Min Gas: 10000000000000"
- width: 200
- validator: RegExpValidator { regExp: /\d*/ }
- }
- }
+ // Rectangle {
+ // id: minGasPriceRect
+ // anchors.top: parent.top
+ // anchors.topMargin: 2
+ // width: 200
+ // TextField {
+ // id: minGasPrice
+ // placeholderText: "Min Gas: 10000000000000"
+ // width: 200
+ // validator: RegExpValidator { regExp: /\d*/ }
+ // }
+ // }
- Rectangle {
- width: 300
- anchors {
- left: minGasPriceRect.right
- leftMargin: 5
- top: parent.top
- topMargin: 2
- }
+ // Rectangle {
+ // width: 300
+ // anchors {
+ // left: minGasPriceRect.right
+ // leftMargin: 5
+ // top: parent.top
+ // topMargin: 2
+ // }
- TextField {
- id: blockExtra
- placeholderText: "Extra"
- width: parent.width
- maximumLength: 1024
- }
- }
+ // TextField {
+ // id: blockExtra
+ // placeholderText: "Extra"
+ // width: parent.width
+ // maximumLength: 1024
+ // }
+ // }
}
}
diff --git a/cmd/mist/assets/qml/views/network.qml b/cmd/mist/assets/qml/views/network.qml
index d33b5773c..fe4c7734f 100644
--- a/cmd/mist/assets/qml/views/network.qml
+++ b/cmd/mist/assets/qml/views/network.qml
@@ -93,7 +93,6 @@ Rectangle {
// Check if it's mining and set it accordingly
if (miningSliderValue > 0 && !eth.miner().mining()) {
// If the
- eth.setGasPrice("10000000000000");
eth.miner().start();
} else if (miningSliderValue == 0 && eth.miner().mining()) {
eth.miner().stop();
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
index 4198c6316..2679e0f95 100644
--- a/cmd/mist/ui_lib.go
+++ b/cmd/mist/ui_lib.go
@@ -175,22 +175,12 @@ func (self *UiLib) RemoveLocalTransaction(id int) {
//self.miner.RemoveLocalTx(id)
}
-func (self *UiLib) SetGasPrice(price string) {
- self.Miner().MinAcceptedGasPrice = ethutil.Big(price)
-}
-
-func (self *UiLib) SetExtra(extra string) {
- self.Miner().Extra = extra
-}
-
func (self *UiLib) ToggleMining() bool {
- if !self.Miner().Mining() {
- self.Miner().Start()
-
- return true
+ if !self.eth.IsMining() {
+ err := self.eth.StartMining()
+ return err == nil
} else {
- self.Miner().Stop()
-
+ self.eth.StopMining()
return false
}
}