diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/execution.go | 10 | ||||
| -rw-r--r-- | core/state_transition.go | 2 | ||||
| -rw-r--r-- | core/vm/environment.go | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/core/execution.go b/core/execution.go index 893b79dc7..72eb22bd5 100644 --- a/core/execution.go +++ b/core/execution.go @@ -39,20 +39,22 @@ func (self *Execution) exec(contextAddr *common.Address, code []byte, caller vm. return nil, vm.DepthError{} } - snapshot := env.State().Copy() + vsnapshot := env.State().Copy() if self.address == nil { // Generate a new address nonce := env.State().GetNonce(caller.Address()) addr := crypto.CreateAddress(caller.Address(), nonce) - self.address = &addr env.State().SetNonce(caller.Address(), nonce+1) + self.address = &addr } + snapshot := env.State().Copy() from, to := env.State().GetStateObject(caller.Address()), env.State().GetOrNewStateObject(*self.address) err = env.Transfer(from, to, self.value) if err != nil { - env.State().Set(snapshot) - //caller.ReturnGas(self.Gas, self.price) + env.State().Set(vsnapshot) + + caller.ReturnGas(self.Gas, self.price) return nil, ValueTransferErr("insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance()) } diff --git a/core/state_transition.go b/core/state_transition.go index d46838d02..6312dee88 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -196,7 +196,6 @@ func (self *StateTransition) transitionState() (ret []byte, usedGas *big.Int, er } // Increment the nonce for the next transaction - self.state.SetNonce(sender.Address(), sender.Nonce()+1) vmenv := self.env var ref vm.ContextRef @@ -214,6 +213,7 @@ func (self *StateTransition) transitionState() (ret []byte, usedGas *big.Int, er } } } else { + self.state.SetNonce(sender.Address(), sender.Nonce()+1) ret, err = vmenv.Call(self.From(), self.To().Address(), self.msg.Data(), self.gas, self.gasPrice, self.value) } diff --git a/core/vm/environment.go b/core/vm/environment.go index a0a18a99b..6c5202185 100644 --- a/core/vm/environment.go +++ b/core/vm/environment.go @@ -7,8 +7,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/rlp" ) type Environment interface { |