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

Call initial closure with proper tx argument

Browse Source
This commit is contained in:
obscuren
2014-04-23 15:53:53 +02:00
parent ef7f3f36e2
commit c81804444f
3 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ethchain/vm.go
View File

@ -53,11 +53,12 @@ var isRequireError = false
func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err error) {
// Recover from any require exception
defer func() {
if r := recover(); r != nil && isRequireError {
if r := recover(); r != nil /*&& isRequireError*/ {
fmt.Println(r)
ret = closure.Return(nil)
err = fmt.Errorf("%v", r)
fmt.Println("vm err", err)
}
}()
@ -315,6 +316,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
case oCALLDATALOAD:
require(1)
offset := stack.Pop().Int64()
fmt.Println(closure.Args)
val := closure.Args[offset : offset+31]
stack.Push(ethutil.BigD(val))