Merge

ethereal/assets/qml/newTransaction/_new_contract.qml

@@ -0,0 +1,162 @@
+import QtQuick 2.0
+import QtQuick.Controls 1.0;
+import QtQuick.Layouts 1.0;
+import QtQuick.Dialogs 1.0;
+import QtQuick.Window 2.1;
+import QtQuick.Controls.Styles 1.1
+import Ethereum 1.0
+
+Component {
+	id: newContract
+	Column {
+		id: mainContractColumn
+		function contractFormReady(){
+			if(codeView.text.length > 0 && txValue.text.length > 0 && txGas.text.length > 0 && txGasPrice.length > 0) {
+				txButton.state = "READY"
+			}else{
+				txButton.state = "NOTREADY"
+			}
+		}
+		states: [
+			State{
+				name: "ERROR"
+				PropertyChanges { target: txResult; visible:true}
+				PropertyChanges { target: codeView; visible:true}
+			},
+			State {
+				name: "DONE"
+				PropertyChanges { target: txValue; visible:false}
+				PropertyChanges { target: txGas; visible:false}
+				PropertyChanges { target: txGasPrice; visible:false}
+				PropertyChanges { target: codeView; visible:false}
+				PropertyChanges { target: txButton; visible:false}
+				PropertyChanges { target: txDataLabel; visible:false}
+
+				PropertyChanges { target: txResult; visible:true}
+				PropertyChanges { target: txOutput; visible:true}
+				PropertyChanges { target: newTxButton; visible:true}
+			},
+			State {
+				name: "SETUP"
+				PropertyChanges { target: txValue; visible:true; text: ""}
+				PropertyChanges { target: txGas; visible:true; text: ""}
+				PropertyChanges { target: txGasPrice; visible:true; text: ""}
+				PropertyChanges { target: codeView; visible:true; text: ""}
+				PropertyChanges { target: txButton; visible:true}
+				PropertyChanges { target: txDataLabel; visible:true}
+
+				PropertyChanges { target: txResult; visible:false}
+				PropertyChanges { target: txOutput; visible:false}
+				PropertyChanges { target: newTxButton; visible:false}
+			}
+		]
+		width: 400
+		spacing: 5
+		anchors.left: parent.left
+		anchors.top: parent.top
+		anchors.leftMargin: 5
+		anchors.topMargin: 5
+
+		TextField {
+			id: txValue
+			width: 200
+			placeholderText: "Amount"
+			validator: IntValidator { }
+			onTextChanged: {
+				contractFormReady()
+			}
+		}
+		TextField {
+			id: txGas
+			width: 200
+			validator: IntValidator { }
+			placeholderText: "Gas"
+			onTextChanged: {
+				contractFormReady()
+			}
+		}
+		TextField {
+			id: txGasPrice
+			width: 200
+			placeholderText: "Gas price"
+			validator: IntValidator { }
+			onTextChanged: {
+				contractFormReady()
+			}
+		}
+
+		Label {
+			id: txDataLabel
+			text: "Transaction data"
+		}
+
+		TextArea {
+			id: codeView
+			anchors.topMargin: 5
+			Layout.fillWidth: true
+			width: parent.width /2
+			onTextChanged: {
+				contractFormReady()
+			}
+		}
+
+		Button {
+			id: txButton
+			states: [
+				State {
+					name: "READY"
+					PropertyChanges { target: txButton; enabled: true}
+				},
+				State {
+					name: "NOTREADY"
+					PropertyChanges { target: txButton; enabled:false}
+				}
+			]
+			text: "Send"
+			enabled: false
+			onClicked: {
+				//this.enabled = false
+				var res = eth.createTx("", txValue.text, txGas.text, txGasPrice.text, codeView.text)
+				if(res[1]) {
+					txResult.text = "Your contract <b>could not</b> be send over the network:\n<b>"
+					txResult.text += res[1].error()
+					txResult.text += "</b>"
+					mainContractColumn.state = "ERROR"
+				} else {
+					txResult.text = "Your contract has been submitted:\n"
+					txOutput.text = res[0]
+					mainContractColumn.state = "DONE"
+				}
+			}
+		}
+		Text {
+			id: txResult
+			visible: false
+		}
+		TextField {
+			id: txOutput
+			visible: false
+			width: 530
+		}
+		Button {
+			id: newTxButton
+			visible: false
+			text: "Create an other contract"
+			onClicked: {
+				this.visible = false
+				txResult.text = ""
+				txOutput.text = ""
+				mainContractColumn.state = "SETUP"
+			}
+		}
+
+		Button {
+			id: debugButton
+			text: "Debug"
+			onClicked: {
+				var res = ui.debugTx("", txValue.text, txGas.text, txGasPrice.text, codeView.text)
+				debugWindow.visible = true
+			}
+		}
+	}
+}

ethereal/assets/qml/newTransaction/_simple_send.qml

@@ -0,0 +1,111 @@
+import QtQuick 2.0
+import QtQuick.Controls 1.0;
+import QtQuick.Layouts 1.0;
+import QtQuick.Dialogs 1.0;
+import QtQuick.Window 2.1;
+import QtQuick.Controls.Styles 1.1
+import Ethereum 1.0
+
+Component {
+	id: newTransaction
+	Column {
+		id: simpleSendColumn
+		states: [
+			State{
+				name: "ERROR"
+			},
+			State {
+				name: "DONE"
+				PropertyChanges { target: txSimpleValue; visible:false}
+				PropertyChanges { target: txSimpleRecipient; visible:false}
+				PropertyChanges { target:newSimpleTxButton; visible:false}
+
+				PropertyChanges { target: txSimpleResult; visible:true}
+				PropertyChanges { target: txSimpleOutput; visible:true}
+				PropertyChanges { target:newSimpleTxButton; visible:true}
+			},
+			State {
+				name: "SETUP"
+				PropertyChanges { target: txSimpleValue; visible:true; text: ""}
+				PropertyChanges { target: txSimpleRecipient; visible:true; text: ""}
+				PropertyChanges { target: txSimpleButton; visible:true}
+				PropertyChanges { target:newSimpleTxButton; visible:false}
+			}
+		]
+		spacing: 5
+		anchors.leftMargin: 5
+		anchors.topMargin: 5
+		anchors.top: parent.top
+		anchors.left: parent.left
+
+		function checkFormState(){
+			if(txSimpleRecipient.text.length == 40 && txSimpleValue.text.length > 0) {
+				txSimpleButton.state = "READY"
+			}else{
+				txSimpleButton.state = "NOTREADY"
+			}
+		}
+
+		TextField {
+			id: txSimpleRecipient
+			placeholderText: "Recipient address"
+			Layout.fillWidth: true
+			validator: RegExpValidator { regExp: /[a-f0-9]{40}/ }
+			width: 530
+			onTextChanged: { checkFormState() }
+		}
+		TextField {
+			id: txSimpleValue
+			placeholderText: "Amount"
+			anchors.rightMargin: 5
+			validator: IntValidator { }
+			onTextChanged: { checkFormState() }
+		}
+		Button {
+			id: txSimpleButton
+			states: [
+				State {
+					name: "READY"
+					PropertyChanges { target: txSimpleButton; enabled: true}
+				},
+				State {
+					name: "NOTREADY"
+					PropertyChanges { target: txSimpleButton; enabled: false}
+				}
+			]
+			text: "Send"
+			enabled: false
+			onClicked: {
+				//this.enabled = false
+				var res = eth.createTx(txSimpleRecipient.text, txSimpleValue.text,"","","")
+				if(res[1]) {
+					txSimpleResult.text = "There has been an error broadcasting your transaction:" + res[1].error()
+				} else {
+					txSimpleResult.text = "Your transaction has been broadcasted over the network.\nYour transaction id is:"
+					txSimpleOutput.text = res[0]
+					this.visible = false
+					simpleSendColumn.state = "DONE"
+				}
+			}
+		}
+		Text {
+			id: txSimpleResult
+			visible: false
+
+		}
+		TextField {
+			id: txSimpleOutput
+			visible: false
+			width: 530
+		}
+		Button {
+			id: newSimpleTxButton
+			visible: false
+			text: "Create an other transaction"
+			onClicked: {
+				this.visible = false
+				simpleSendColumn.state = "SETUP"
+			}
+		}
+	}
+}

ethereal/assets/qml/wallet.qml

@@ -25,35 +25,6 @@ ApplicationWindow {
 			}
 		}
 
-		Menu {
-			title: "Test"
-			MenuItem {
-				text: "Test test"
-				shortcut: "Ctrl+t"
-        onTriggered: {
-          var win
-          function finishedLoading(){
-            console.log("Trigged")
-            win = wizard.createObject(root)
-          }
-          console.log("Loading wizard")
-
-          var wizard = Qt.createComponent("first_run.qml")
-          if(wizard.status== Component.Ready){
-            console.log("Component is ready")
-            finishedLoading()
-          }else if( wizard.status == Component.Error){
-            console.log("Error loading component:", wizard.errorString())
-          }
-          else{
-            wizard.statusChanged.connect(finishedLoading)
-            console.log("Component is NOT ready")
-            win = wizard.createObject(root)
-          }
-        }
-			}
-		}
-
 		Menu {
 			title: "Network"
 			MenuItem {
@@ -108,6 +79,7 @@ ApplicationWindow {
 			//color: "#D9DDE7"
 			color: "#252525"
 
+
 			ColumnLayout {
 				y: 50
 				anchors.left: parent.left
@@ -168,6 +140,7 @@ ApplicationWindow {
 					anchors.fill: parent
 					TableViewColumn{ role: "value" ; title: "Value" ; width: 100 }
 					TableViewColumn{ role: "address" ; title: "Address" ; width: 430 }
+					TableViewColumn{ role: "contract" ; title: "Contract" ; width: 100 }
 
 					model: txModel
 				}
@@ -187,239 +160,18 @@ ApplicationWindow {
 					anchors.bottomMargin: 5
 					id: newTransactionTab
 					Component.onCompleted:{
-						addTab("Send ether", newTransaction)
+						var component = Qt.createComponent("newTransaction/_simple_send.qml")
-						addTab("Create contract", newContract)
+						var newTransaction = component.createObject("newTransaction")
-					}
-				}
-				Component {
-					id: newTransaction
-					Column {
-						spacing: 5
-						anchors.leftMargin: 5
-						anchors.topMargin: 5
-						anchors.top: parent.top
-						anchors.left: parent.left
-						TextField {
-							id: txSimpleRecipient
-							placeholderText: "Recipient address"
-							Layout.fillWidth: true
-              validator: RegExpValidator { regExp: /[a-f0-9]{40}/ }
-							width: 530
-						}
-						TextField {
-							id: txSimpleValue
-							placeholderText: "Amount"
-							anchors.rightMargin: 5
-							validator: IntValidator { }
-						}
-						Button {
-							id: txSimpleButton
-							text: "Send"
-							onClicked: {
-								//this.enabled = false
-								var res = eth.createTx(txSimpleRecipient.text, txSimpleValue.text,"","","")
-								if(res[1]) {
-									txSimpleResult.text = "There has been an error broadcasting your transaction:" + res[1].error()
-									txSimpleResult.visible = true
-								} else {
-									txSimpleResult.text = "Your transaction has been broadcasted over the network.\nYour transaction id is:"
-									txSimpleOutput.text = res[0]
-									txSimpleOutput.visible = true
-									txSimpleResult.visible = true
-                  txSimpleValue.visible = false
-                  txSimpleRecipient.visible = false
-									txSimpleValue.text = ""
-									txSimpleRecipient.text = ""
-                  txSimpleRecipient.focus = true
-                  newSimpleTxButton.visible = true
-                  this.visible = false
-								}
-							}
-						}
-						Text {
-							id: txSimpleResult
-							visible: false
 
-						}
+						component = Qt.createComponent("newTransaction/_new_contract.qml")
-						TextField {
+						var newContract = component.createObject("newContract")
-							id: txSimpleOutput
-							visible: false
-							width: 530
-						}
-						Button {
-              id: newSimpleTxButton
-							visible: false
-							text: "Create an other transaction"
-							onClicked: {
-								this.visible = false
-                txSimpleResult.text = ""
-                txSimpleOutput.text = ""
-                txSimpleResult.visible = false
-                txSimpleOutput.visible = false
-                txSimpleValue.visible = true
-                txSimpleRecipient.visible = true
-                txSimpleButton.visible = true
-							}
-						}
-					}
-				}
-				Component {
-					id: newContract
-					Column {
-            id: mainContractColumn
-            function contractFormReady(){
-              if(codeView.text.length > 0 && txValue.text.length > 0 && txGas.text.length > 0 && txGasPrice.length > 0) {
-                txButton.state = "READY"
-              }else{
-                txButton.state = "NOTREADY"
-              }
-            }
-            states: [
-              State{
-                name: "ERROR"
-                PropertyChanges { target: txResult; visible:true}
-                PropertyChanges { target: codeView; visible:true}
-              },
-              State {
-                name: "DONE"
-                PropertyChanges { target: txValue; visible:false}
-                PropertyChanges { target: txGas; visible:false}
-                PropertyChanges { target: txGasPrice; visible:false}
-                PropertyChanges { target: codeView; visible:false}
-                PropertyChanges { target: txButton; visible:false}
-                PropertyChanges { target: txDataLabel; visible:false}
-
-                PropertyChanges { target: txResult; visible:true}
-                PropertyChanges { target: txOutput; visible:true}
-                PropertyChanges { target: newTxButton; visible:true}
-              },
-              State {
-                name: "SETUP"
-                PropertyChanges { target: txValue; visible:true; text: ""}
-                PropertyChanges { target: txGas; visible:true; text: ""}
-                PropertyChanges { target: txGasPrice; visible:true; text: ""}
-                PropertyChanges { target: codeView; visible:true; text: ""}
-                PropertyChanges { target: txButton; visible:true}
-                PropertyChanges { target: txDataLabel; visible:true}
-
-                PropertyChanges { target: txResult; visible:false}
-                PropertyChanges { target: txOutput; visible:false}
-                PropertyChanges { target: newTxButton; visible:false}
-              }
-            ]
-						width: 400
-            spacing: 5
-						anchors.left: parent.left
-						anchors.top: parent.top
-						anchors.leftMargin: 5
-						anchors.topMargin: 5
-
-						TextField {
-							id: txValue
-							width: 200
-							placeholderText: "Amount"
-							validator: IntValidator { }
-              onTextChanged: {
-                contractFormReady()
-              }
-						}
-						TextField {
-							id: txGas
-							width: 200
-							validator: IntValidator { }
-							placeholderText: "Gas"
-              onTextChanged: {
-                contractFormReady()
-              }
-						}
-						TextField {
-							id: txGasPrice
-							width: 200
-							placeholderText: "Gas price"
-							validator: IntValidator { }
-              onTextChanged: {
-                contractFormReady()
-              }
-						}
 
-						Label {
+						addTab("Simple send", newTransaction)
-              id: txDataLabel
+						addTab("Create contract", newContract)
-							text: "Transaction data"
-						}
-
-						TextArea {
-							id: codeView
-							anchors.topMargin: 5
-							Layout.fillWidth: true
-							width: parent.width /2
-              onTextChanged: {
-                contractFormReady()
-              }
-						}
-
-						Button {
-							id: txButton
-              states: [
-                State {
-                  name: "READY"
-                  PropertyChanges { target: txButton; enabled: true}
-                },
-                State {
-                  name: "NOTREADY"
-                  PropertyChanges { target: txButton; enabled:false}
-                }
-              ]
-							text: "Send"
-              enabled: false
-							onClicked: {
-								//this.enabled = false
-								var res = eth.createTx("", txValue.text, txGas.text, txGasPrice.text, codeView.text)
-								if(res[1]) {
-                  txResult.text = "Your contract <b>could not</b> be send over the network:\n<b>"
-                  txResult.text += res[1].error()
-                  txResult.text += "</b>"
-                  mainContractColumn.state = "ERROR"
-								} else {
-                  txResult.text = "Your contract has been submitted:\n"
-                  txOutput.text = res[0]
-                  mainContractColumn.state = "DONE"
-								}
-							}
-						}
-            Text {
-              id: txResult
-              visible: false
-            }
-						TextField {
-							id: txOutput
-							visible: false
-							width: 530
-						}
-						Button {
-              id: newTxButton
-							visible: false
-							text: "Create an other contract"
-							onClicked: {
-								this.visible = false
-                txResult.text = ""
-                txOutput.text = ""
-                mainContractColumn.state = "SETUP"
-							}
-						}
-
-						Button {
-							id: debugButton
-							text: "Debug"
-							onClicked: {
-								var res = ui.debugTx("", txValue.text, txGas.text, txGasPrice.text, codeView.text)
-								debugWindow.visible = true
-							}
-						}
 					}
 				}
 			}
 
-
 			Rectangle {
 				id: networkView
 				property var title: "Network"
@@ -461,26 +213,26 @@ ApplicationWindow {
 			}
 
 			/*
-			signal addPlugin(string name)
+			 signal addPlugin(string name)
-			Component {
+			 Component {
-				id: pluginWindow
+				 id: pluginWindow
-				Rectangle {
+				 Rectangle {
-					anchors.fill: parent
+					 anchors.fill: parent
-					Label {
+					 Label {
-						id: pluginTitle
+						 id: pluginTitle
-						anchors.centerIn: parent
+						 anchors.centerIn: parent
-						text: "Hello world"
+						 text: "Hello world"
-					}
+					 }
-					Component.onCompleted: setView(this)
+					 Component.onCompleted: setView(this)
-				}
+				 }
-			}
+			 }
-
+
-			onAddPlugin: {
+			 onAddPlugin: {
-				var pluginWin = pluginWindow.createObject(mainView)
+				 var pluginWin = pluginWindow.createObject(mainView)
-				console.log(pluginWin)
+				 console.log(pluginWin)
-				pluginWin.pluginTitle.text = "Test"
+				 pluginWin.pluginTitle.text = "Test"
-			}
+			 }
-			*/
+			 */
 		}
 	}
 
@@ -712,7 +464,13 @@ ApplicationWindow {
 	}
 
 	function addTx(tx) {
-		txModel.insert(0, {hash: tx.hash, address: tx.address, value: tx.value})
+		var isContract
+		if (tx.contract == true){
+			isContract = "Yes"
+		}else{
+			isContract = "No"
+		}
+		txModel.insert(0, {hash: tx.hash, address: tx.address, value: tx.value, contract: isContract})
 	}
 
 	function addBlock(block) {

ethereal/ui/gui.go

@@ -21,13 +21,15 @@ type Block struct {
 
 type Tx struct {
 	Value, Hash, Address string
+	Contract             bool
 }
 
 func NewTxFromTransaction(tx *ethchain.Transaction) *Tx {
 	hash := hex.EncodeToString(tx.Hash())
 	sender := hex.EncodeToString(tx.Recipient)
+	isContract := len(tx.Data) > 0
 
-	return &Tx{Hash: hash, Value: ethutil.CurrencyToString(tx.Value), Address: sender}
+	return &Tx{Hash: hash, Value: ethutil.CurrencyToString(tx.Value), Address: sender, Contract: isContract}
 }
 
 // Creates a new QML Block from a chain block