gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added a transfer method to vm env

Browse Source
This commit is contained in:
obscuren
2014-10-22 15:22:21 +02:00
parent 27cb0750c1
commit b5beb1aac1
9 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vm/execution.go
View File

@ -48,17 +48,17 @@ func (self *Execution) exec(code, caddr []byte, caller ClosureRef) (ret []byte,
Value: self.value,
})
object := caller.Object()
if object.Balance.Cmp(self.value) < 0 {
from, to := caller.Object(), env.State().GetOrNewStateObject(self.address)
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, object.Balance)
err = fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance)
} else {
stateObject := env.State().GetOrNewStateObject(self.address)
self.object = stateObject
self.object = to
caller.Object().SubAmount(self.value)
stateObject.AddAmount(self.value)
//caller.Object().SubAmount(self.value)
//stateObject.AddAmount(self.value)
// Pre-compiled contracts (address.go) 1, 2 & 3.
naddr := ethutil.BigD(caddr).Uint64()
@ -69,7 +69,7 @@ func (self *Execution) exec(code, caddr []byte, caller ClosureRef) (ret []byte,
}
} else {
// Create a new callable closure
c := NewClosure(msg, caller, stateObject, code, self.Gas, self.price)
c := NewClosure(msg, caller, to, code, self.Gas, self.price)
c.exe = self
if self.vm.Depth() == MaxCallDepth {