Fix merge conflicts

1 files changed, 86 insertions, 0 deletions

diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 742a1283a..2c8d1f241 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -406,6 +406,15 @@ ApplicationWindow {
                 mainContractColumn.state = "SETUP"
 							}
 						}
+
+						Button {
+							id: debugButton
+							text: "Debug"
+							onClicked: {
+								var res = ui.debugTx("", txValue.text, txGas.text, txGasPrice.text, codeView.text)
+								debugWindow.visible = true
+							}
+						}
 					}
 				}
 			}
@@ -601,6 +610,83 @@ ApplicationWindow {
 
 	}
 
+	Window {
+		id: debugWindow
+		visible: false
+		title: "Debugger"
+		minimumWidth: 600
+		minimumHeight: 600
+		width: 800
+		height: 600
+
+		SplitView {
+			anchors.fill: parent
+			property var asmModel: ListModel {
+				id: asmModel
+			}
+			TableView {
+				id: asmTableView
+				width: 200
+				TableViewColumn{ role: "value" ; title: "" ; width: 100 }
+				model: asmModel
+			}
+
+			Rectangle {
+				anchors.left: asmTableView.right
+				anchors.right: parent.right
+				SplitView {
+					orientation: Qt.Vertical
+					anchors.fill: parent
+
+					TableView {
+						property var memModel: ListModel {
+							id: memModel
+						}
+						height: parent.height/2
+						width: parent.width
+						TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50}
+						TableViewColumn{ role: "value" ; title: "Memory" ; width: 750}
+						model: memModel
+					}
+
+					TableView {
+						property var stackModel: ListModel {
+							id: stackModel
+						}
+						height: parent.height/2
+						width: parent.width
+						TableViewColumn{ role: "value" ; title: "Stack" ; width: parent.width }
+						model: stackModel
+					}
+				}
+			}
+		}
+	}
+
+	function setAsm(asm) {
+		//for(var i = 0; i < asm.length; i++) {
+		asmModel.append({asm: asm})
+		//}
+	}
+	function clearAsm() {
+		asmModel.clear()
+	}
+
+	function setMem(mem) {
+		memModel.append({num: mem.num, value: mem.value})
+	}
+	function clearMem(){
+		memModel.clear()
+	}
+
+	function setStack(stack) {
+		stackModel.append({value: stack})
+	}
+
+	function clearStack() {
+		stackModel.clear()
+	}
+
 	function loadPlugin(name) {
 		console.log("Loading plugin" + name)
 		mainView.addPlugin(name)