From 1954ef47e67762f0308544e3a17976e4c3927e32 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 2 Jul 2014 00:06:21 +0200 Subject: [PATCH] Suicide is deferred to update --- ethchain/vm.go | 16 ++++++++++------ ethutil/bytes.go | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ethchain/vm.go b/ethchain/vm.go index c5ccb34203..0b8799a126 100644 --- a/ethchain/vm.go +++ b/ethchain/vm.go @@ -150,7 +150,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro case SSTORE: var mult *big.Int y, x := stack.Peekn() - val := closure.GetMem(x) + val := closure.GetStorage(x) if val.IsEmpty() && len(y.Bytes()) > 0 { mult = ethutil.Big2 } else if !val.IsEmpty() && len(y.Bytes()) == 0 { @@ -567,7 +567,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro case SLOAD: require(1) loc := stack.Pop() - val := closure.GetMem(loc) + val := closure.GetStorage(loc) stack.Push(val.BigInt()) @@ -713,10 +713,14 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro receiver := vm.state.GetAccount(stack.Pop().Bytes()) receiver.AddAmount(closure.object.Amount) - trie := closure.object.state.trie - trie.NewIterator().Each(func(key string, v *ethutil.Value) { - trie.Delete(key) - }) + closure.object.MarkForDeletion() + + /* + trie := closure.object.state.trie + trie.NewIterator().Each(func(key string, v *ethutil.Value) { + trie.Delete(key) + }) + */ fallthrough case STOP: // Stop the closure diff --git a/ethutil/bytes.go b/ethutil/bytes.go index ad60e62fd9..d68a69433f 100644 --- a/ethutil/bytes.go +++ b/ethutil/bytes.go @@ -129,7 +129,7 @@ func FormatData(data string) []byte { } func RightPadBytes(slice []byte, l int) []byte { - if l <= len(slice) { + if l < len(slice) { return slice } @@ -140,7 +140,7 @@ func RightPadBytes(slice []byte, l int) []byte { } func LeftPadBytes(slice []byte, l int) []byte { - if l <= len(slice) { + if l < len(slice) { return slice }