From 36215b3a8c625ffdcd3c6db5cb57b03f5858eca1 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 30 Sep 2014 19:25:41 +0100 Subject: [PATCH 1/2] Reorganisation of UI. --- alethzero/Main.ui | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) 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 @@ Deb&ug - - - &Dump Trace - - - - - - - - - - - - - - @@ -199,10 +182,39 @@ + + + D&ebugger + + + + &Dump Trace + + + + + + + + Type Here + + + + + + + + + + + + + + From c2368432254c05a8d9afa29efd0d2f294faa8c53 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Wed, 1 Oct 2014 10:58:57 +0100 Subject: [PATCH 2/2] fix for callstateless. --- libevm/VM.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 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);