aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-14 03:31:31 +0800
committerobscuren <geffobscura@gmail.com>2015-01-14 03:31:31 +0800
commitbb55307a9d8fa73b0fbc0727f8b80925a87627b7 (patch)
tree7fc6d7e9e7375d68dcb24ecd84cc074b881b51a2 /core
parent8f733461b3f4aee982eb9991d46ff828281b1ac9 (diff)
downloaddexon-bb55307a9d8fa73b0fbc0727f8b80925a87627b7.tar
dexon-bb55307a9d8fa73b0fbc0727f8b80925a87627b7.tar.gz
dexon-bb55307a9d8fa73b0fbc0727f8b80925a87627b7.tar.bz2
dexon-bb55307a9d8fa73b0fbc0727f8b80925a87627b7.tar.lz
dexon-bb55307a9d8fa73b0fbc0727f8b80925a87627b7.tar.xz
dexon-bb55307a9d8fa73b0fbc0727f8b80925a87627b7.tar.zst
dexon-bb55307a9d8fa73b0fbc0727f8b80925a87627b7.zip
Updated tests
Diffstat (limited to 'core')
-rw-r--r--core/execution.go15
1 files changed, 12 insertions, 3 deletions
diff --git a/core/execution.go b/core/execution.go
index 1057089f1..756a3ed03 100644
--- a/core/execution.go
+++ b/core/execution.go
@@ -5,6 +5,7 @@ import (
"math/big"
"time"
+ "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/vm"
)
@@ -40,14 +41,22 @@ func (self *Execution) exec(code, contextAddr []byte, caller vm.ContextRef) (ret
return nil, vm.DepthError{}
}
+ vsnapshot := env.State().Copy()
+ if len(self.address) == 0 {
+ // Generate a new address
+ nonce := env.State().GetNonce(caller.Address())
+ self.address = crypto.CreateAddress(caller.Address(), nonce)
+ env.State().SetNonce(caller.Address(), nonce+1)
+ }
+
from, to := env.State().GetStateObject(caller.Address()), env.State().GetOrNewStateObject(self.address)
- // Skipping transfer is used on testing for the initial call
err = env.Transfer(from, to, self.value)
if err != nil {
+ env.State().Set(vsnapshot)
+
caller.ReturnGas(self.Gas, self.price)
- err = fmt.Errorf("insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance())
- return
+ return nil, fmt.Errorf("insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance())
}
snapshot := env.State().Copy()