aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-20 22:49:12 +0800
committerobscuren <geffobscura@gmail.com>2015-01-20 22:49:12 +0800
commit9845029a7535672746139084138f3e894e604e44 (patch)
tree3503d094eac24e63108938a37008a2eab3b3528d /cmd
parent375cc67ba6dbc57e69aa594a6ac26ebc9b3a713a (diff)
downloaddexon-9845029a7535672746139084138f3e894e604e44.tar
dexon-9845029a7535672746139084138f3e894e604e44.tar.gz
dexon-9845029a7535672746139084138f3e894e604e44.tar.bz2
dexon-9845029a7535672746139084138f3e894e604e44.tar.lz
dexon-9845029a7535672746139084138f3e894e604e44.tar.xz
dexon-9845029a7535672746139084138f3e894e604e44.tar.zst
dexon-9845029a7535672746139084138f3e894e604e44.zip
StdVm by default
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mist/assets/debugger/debugger.qml3
-rw-r--r--cmd/mist/debugger.go3
-rw-r--r--cmd/mist/ui_lib.go6
3 files changed, 8 insertions, 4 deletions
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()
}