aboutsummaryrefslogtreecommitdiffstats
path: root/core/execution.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-17 19:57:35 +0800
committerobscuren <geffobscura@gmail.com>2014-12-17 19:57:35 +0800
commitb1c58b76a9588a90db5a773a997bb70265c378d3 (patch)
tree0d2631ec0b9324f08fcd2e82cec797fab75e9d4d /core/execution.go
parentef4135eabe5cb25f8972371c5681e1611ce0cde9 (diff)
downloadgo-tangerine-b1c58b76a9588a90db5a773a997bb70265c378d3.tar.gz
go-tangerine-b1c58b76a9588a90db5a773a997bb70265c378d3.tar.zst
go-tangerine-b1c58b76a9588a90db5a773a997bb70265c378d3.zip
moved err check
Diffstat (limited to 'core/execution.go')
-rw-r--r--core/execution.go32
1 files changed, 16 insertions, 16 deletions
diff --git a/core/execution.go b/core/execution.go
index a464abc66..58d46c509 100644
--- a/core/execution.go
+++ b/core/execution.go
@@ -40,6 +40,12 @@ func (self *Execution) exec(code, contextAddr []byte, caller vm.ClosureRef) (ret
// Skipping transfer is used on testing for the initial call
if !self.SkipTransfer {
err = env.Transfer(from, to, self.value)
+ if err != nil {
+ caller.ReturnGas(self.Gas, self.price)
+
+ err = fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance)
+ return
+ }
}
snapshot := env.State().Copy()
@@ -50,23 +56,17 @@ func (self *Execution) exec(code, contextAddr []byte, caller vm.ClosureRef) (ret
chainlogger.Debugf("post state %x\n", env.State().Root())
}()
- if err != nil {
- caller.ReturnGas(self.Gas, self.price)
-
- err = fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance)
- } else {
- self.object = to
- // Pre-compiled contracts (address.go) 1, 2 & 3.
- naddr := ethutil.BigD(contextAddr).Uint64()
- if p := vm.Precompiled[naddr]; p != nil {
- if self.Gas.Cmp(p.Gas(len(self.input))) >= 0 {
- ret = p.Call(self.input)
- self.vm.Printf("NATIVE_FUNC(%x) => %x", naddr, ret)
- self.vm.Endl()
- }
- } else {
- ret, err = self.vm.Run(to, caller, code, self.value, self.Gas, self.price, self.input)
+ self.object = to
+ // Pre-compiled contracts (address.go) 1, 2 & 3.
+ naddr := ethutil.BigD(contextAddr).Uint64()
+ if p := vm.Precompiled[naddr]; p != nil {
+ if self.Gas.Cmp(p.Gas(len(self.input))) >= 0 {
+ ret = p.Call(self.input)
+ self.vm.Printf("NATIVE_FUNC(%x) => %x", naddr, ret)
+ self.vm.Endl()
}
+ } else {
+ ret, err = self.vm.Run(to, caller, code, self.value, self.Gas, self.price, self.input)
}
return