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

Debug output, minor fixes and tweaks

Browse Source 
* Script compile length fix
* Transition fix
This commit is contained in:
obscuren
2014-07-04 15:32:10 +02:00
parent 23b5b5fa36
commit 90eb4f1939
5 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ethchain/state_transition.go
View File

@ -201,8 +201,7 @@ func (self *StateTransition) TransitionState() (err error) {
// script section for the state object.
self.data = nil
statelogger.Debugln("~> init")
code, err := self.Eval(receiver.Init(), receiver)
code, err := self.Eval(receiver.Init(), receiver, "init")
if err != nil {
//self.state.Set(snapshot)
self.state.ResetStateObject(receiver)
@ -213,8 +212,7 @@ func (self *StateTransition) TransitionState() (err error) {
receiver.script = code
} else {
if len(receiver.Script()) > 0 {
statelogger.Debugln("~> code")
_, err = self.Eval(receiver.Script(), receiver)
_, err = self.Eval(receiver.Script(), receiver, "code")
if err != nil {
//self.state.Set(snapshot)
self.state.ResetStateObject(receiver)
@ -240,7 +238,7 @@ func (self *StateTransition) transferValue(sender, receiver *StateObject) error
return nil
}
func (self *StateTransition) Eval(script []byte, context *StateObject) (ret []byte, err error) {
func (self *StateTransition) Eval(script []byte, context *StateObject, typ string) (ret []byte, err error) {
var (
block = self.block
initiator = self.Sender()
@ -259,6 +257,7 @@ func (self *StateTransition) Eval(script []byte, context *StateObject) (ret []by
Value: self.value,
})
vm.Verbose = true
vm.Fn = typ
ret, err = Call(vm, closure, self.data)
@ -279,7 +278,7 @@ func Call(vm *Vm, closure *Closure, data []byte) (ret []byte, err error) {
// TODO FIXME ASAP
context.state.trie = t2
statelogger.Debugln("Warn: PARANOIA: Different state object roots during copy")
statelogger.Infoln("Warn: PARANOIA: Different state object roots during copy")
}
}