diff --git a/alethzero/Main.ui b/alethzero/Main.ui index 5c0f50a6d..3567d3ffb 100644 --- a/alethzero/Main.ui +++ b/alethzero/Main.ui @@ -161,26 +161,9 @@ <property name="title"> <string>Deb&ug</string> </property> - <widget class="QMenu" name="menuDump_Trace"> - <property name="title"> - <string>&Dump Trace</string> - </property> - <addaction name="dumpTrace"/> - <addaction name="dumpTraceStorage"/> - <addaction name="dumpTracePretty"/> - </widget> - <addaction name="debugCurrent"/> <addaction name="debugDumpState"/> <addaction name="debugDumpStatePre"/> <addaction name="separator"/> - <addaction name="debugStep"/> - <addaction name="debugStepInto"/> - <addaction name="debugStepOut"/> - <addaction name="debugStepBack"/> - <addaction name="debugStepBackInto"/> - <addaction name="debugStepBackOut"/> - <addaction name="menuDump_Trace"/> - <addaction name="separator"/> <addaction name="paranoia"/> <addaction name="killBlockchain"/> <addaction name="inject"/> @@ -199,10 +182,39 @@ <addaction name="separator"/> <addaction name="preview"/> </widget> + <widget class="QMenu" name="menuDebugger"> + <property name="title"> + <string>D&ebugger</string> + </property> + <widget class="QMenu" name="menu_Dump_Trace"> + <property name="title"> + <string>&Dump Trace</string> + </property> + <addaction name="dumpTrace"/> + <addaction name="dumpTraceStorage"/> + <addaction name="dumpTracePretty"/> + </widget> + <widget class="QMenu" name="menuType_Here"> + <property name="title"> + <string>Type Here</string> + </property> + </widget> + <addaction name="debugCurrent"/> + <addaction name="menu_Dump_Trace"/> + <addaction name="separator"/> + <addaction name="debugStep"/> + <addaction name="debugStepInto"/> + <addaction name="debugStepOut"/> + <addaction name="debugStepBack"/> + <addaction name="debugStepBackInto"/> + <addaction name="debugStepBackOut"/> + <addaction name="menuType_Here"/> + </widget> <addaction name="menu_File"/> <addaction name="menu_View"/> <addaction name="menu_Network"/> <addaction name="menu_Tools"/> + <addaction name="menuDebugger"/> <addaction name="menu_Debug"/> <addaction name="menu_Help"/> </widget> diff --git a/libevm/VM.h b/libevm/VM.h index cbecc3ee7..3cac55b1f 100644 --- a/libevm/VM.h +++ b/libevm/VM.h @@ -634,7 +634,7 @@ template <class Ext> dev::bytesConstRef dev::eth::VM::go(Ext& _ext, OnOpFunc con if (_ext.balance(_ext.myAddress) >= value) { _ext.subBalance(value); - m_stack.push_back(_ext.call(receiveAddress, value, bytesConstRef(m_temp.data() + inOff, inSize), &gas, bytesRef(m_temp.data() + outOff, outSize), _onOp, Address(), inst == Instruction::CALL ? receiveAddress : _ext.myAddress)); + m_stack.push_back(_ext.call(inst == Instruction::CALL ? receiveAddress : _ext.myAddress, value, bytesConstRef(m_temp.data() + inOff, inSize), &gas, bytesRef(m_temp.data() + outOff, outSize), _onOp, Address(), receiveAddress)); } else m_stack.push_back(0);