From 9845029a7535672746139084138f3e894e604e44 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 20 Jan 2015 15:49:12 +0100
Subject: StdVm by default

---
 cmd/mist/assets/debugger/debugger.qml | 3 ++-
 cmd/mist/debugger.go                  | 3 +++
 cmd/mist/ui_lib.go                    | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'cmd/mist')

diff --git a/cmd/mist/assets/debugger/debugger.qml b/cmd/mist/assets/debugger/debugger.qml
index b30d20e6b..5566e8fca 100644
--- a/cmd/mist/assets/debugger/debugger.qml
+++ b/cmd/mist/assets/debugger/debugger.qml
@@ -19,7 +19,7 @@ ApplicationWindow {
     property alias dataText: rawDataField.text
 
     onClosing: {
-        dbg.Stop()
+        //dbg.Stop()
     }
 
     menuBar: MenuBar {
@@ -353,6 +353,7 @@ ApplicationWindow {
 
 
         ComboBox {
+		visible: false
             id: snippets
             anchors.right: parent.right
             model: ListModel {
diff --git a/cmd/mist/debugger.go b/cmd/mist/debugger.go
index 9df140ab1..58d8da7b2 100644
--- a/cmd/mist/debugger.go
+++ b/cmd/mist/debugger.go
@@ -267,6 +267,9 @@ type storeVal struct {
 	Key, Value string
 }
 
+func (self *Debugger) Step(evm vm.VirtualMachine, op vm.OpCode, mem *vm.Memory, stack *vm.Stack, context *vm.Context) {
+}
+
 func (self *Debugger) BreakHook(pc int, op vm.OpCode, mem *vm.Memory, stack *vm.Stack, stateObject *state.StateObject) bool {
 	self.main.Logln("break on instr:", pc)
 
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
index f3559183e..c88c4dab6 100644
--- a/cmd/mist/ui_lib.go
+++ b/cmd/mist/ui_lib.go
@@ -212,16 +212,16 @@ func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
 	dbWindow := NewDebuggerWindow(self)
 	object := self.eth.ChainManager().State().GetStateObject(ethutil.Hex2Bytes(contractHash))
 	if len(object.Code) > 0 {
-		dbWindow.SetCode("0x" + ethutil.Bytes2Hex(object.Code))
+		dbWindow.SetCode(ethutil.Bytes2Hex(object.Code))
 	}
-	dbWindow.SetData("0x" + data)
+	dbWindow.SetData(data)
 
 	dbWindow.Show()
 }
 
 func (self *UiLib) StartDbWithCode(code string) {
 	dbWindow := NewDebuggerWindow(self)
-	dbWindow.SetCode("0x" + code)
+	dbWindow.SetCode(code)
 	dbWindow.Show()
 }
 
-- 
cgit