diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-03 12:02:00 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-03 12:02:00 +0800 |
| commit | 30fa30bd4a5f12e86480bec0a7dd2fe290c9abc4 (patch) | |
| tree | 7e573f4c0fdb592f5ccd6ff8059136f1ffc3c6c8 /core/state_transition.go | |
| parent | faa54e59c1c276d153299c73afdea246941ec952 (diff) | |
| download | dexon-30fa30bd4a5f12e86480bec0a7dd2fe290c9abc4.tar dexon-30fa30bd4a5f12e86480bec0a7dd2fe290c9abc4.tar.gz dexon-30fa30bd4a5f12e86480bec0a7dd2fe290c9abc4.tar.bz2 dexon-30fa30bd4a5f12e86480bec0a7dd2fe290c9abc4.tar.lz dexon-30fa30bd4a5f12e86480bec0a7dd2fe290c9abc4.tar.xz dexon-30fa30bd4a5f12e86480bec0a7dd2fe290c9abc4.tar.zst dexon-30fa30bd4a5f12e86480bec0a7dd2fe290c9abc4.zip | |
Docs & old code removed
Diffstat (limited to 'core/state_transition.go')
| -rw-r--r-- | core/state_transition.go | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/core/state_transition.go b/core/state_transition.go index 00d9d486a..33dd45f02 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -186,7 +186,7 @@ func (self *StateTransition) TransitionState() (ret []byte, err error) { return } - stateCopy := self.env.State().Copy() + //stateCopy := self.env.State().Copy() vmenv := self.env var ref vm.ContextRef if MessageCreatesContract(msg) { @@ -200,29 +200,33 @@ func (self *StateTransition) TransitionState() (ret []byte, err error) { } } - if vmenv, ok := vmenv.(*VMEnv); ok && tryJit { - statelogger.Infof("CREATE: re-running using JIT (PH=%x)\n", stateCopy.Root()[:4]) - // re-run using the JIT (validation for the JIT) - goodState := vmenv.State().Copy() - vmenv.state = stateCopy - vmenv.SetVmType(vm.JitVmTy) - vmenv.Create(sender, contract.Address(), self.msg.Data(), self.gas, self.gasPrice, self.value) - statelogger.Infof("DONE PH=%x STD_H=%x JIT_H=%x\n", stateCopy.Root()[:4], goodState.Root()[:4], vmenv.State().Root()[:4]) - self.state.Set(goodState) - } + /* + if vmenv, ok := vmenv.(*VMEnv); ok && tryJit { + statelogger.Infof("CREATE: re-running using JIT (PH=%x)\n", stateCopy.Root()[:4]) + // re-run using the JIT (validation for the JIT) + goodState := vmenv.State().Copy() + vmenv.state = stateCopy + vmenv.SetVmType(vm.JitVmTy) + vmenv.Create(sender, contract.Address(), self.msg.Data(), self.gas, self.gasPrice, self.value) + statelogger.Infof("DONE PH=%x STD_H=%x JIT_H=%x\n", stateCopy.Root()[:4], goodState.Root()[:4], vmenv.State().Root()[:4]) + self.state.Set(goodState) + } + */ } else { ret, err = vmenv.Call(self.From(), self.To().Address(), self.msg.Data(), self.gas, self.gasPrice, self.value) - if vmenv, ok := vmenv.(*VMEnv); ok && tryJit { - statelogger.Infof("CALL: re-running using JIT (PH=%x)\n", stateCopy.Root()[:4]) - // re-run using the JIT (validation for the JIT) - goodState := vmenv.State().Copy() - vmenv.state = stateCopy - vmenv.SetVmType(vm.JitVmTy) - vmenv.Call(self.From(), self.To().Address(), self.msg.Data(), self.gas, self.gasPrice, self.value) - statelogger.Infof("DONE PH=%x STD_H=%x JIT_H=%x\n", stateCopy.Root()[:4], goodState.Root()[:4], vmenv.State().Root()[:4]) - self.state.Set(goodState) - } + /* + if vmenv, ok := vmenv.(*VMEnv); ok && tryJit { + statelogger.Infof("CALL: re-running using JIT (PH=%x)\n", stateCopy.Root()[:4]) + // re-run using the JIT (validation for the JIT) + goodState := vmenv.State().Copy() + vmenv.state = stateCopy + vmenv.SetVmType(vm.JitVmTy) + vmenv.Call(self.From(), self.To().Address(), self.msg.Data(), self.gas, self.gasPrice, self.value) + statelogger.Infof("DONE PH=%x STD_H=%x JIT_H=%x\n", stateCopy.Root()[:4], goodState.Root()[:4], vmenv.State().Root()[:4]) + self.state.Set(goodState) + } + */ } if err != nil { |