diff options
author | obscuren <geffobscura@gmail.com> | 2015-03-24 18:49:30 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-03-24 18:49:30 +0800 |
commit | 576df064e5cd4bc027120791484cb8100646f284 (patch) | |
tree | b16186ef4ceb0f7f52dbb4dc30ebce8c96d8cef3 /core/state_transition.go | |
parent | 4877e52c15e4aa606084919acdb0076b0ffaaab2 (diff) | |
download | dexon-576df064e5cd4bc027120791484cb8100646f284.tar dexon-576df064e5cd4bc027120791484cb8100646f284.tar.gz dexon-576df064e5cd4bc027120791484cb8100646f284.tar.bz2 dexon-576df064e5cd4bc027120791484cb8100646f284.tar.lz dexon-576df064e5cd4bc027120791484cb8100646f284.tar.xz dexon-576df064e5cd4bc027120791484cb8100646f284.tar.zst dexon-576df064e5cd4bc027120791484cb8100646f284.zip |
Updated for PV59
* Value XFER are refunded back to the sender if the execution fails
Diffstat (limited to 'core/state_transition.go')
-rw-r--r-- | core/state_transition.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/core/state_transition.go b/core/state_transition.go index e530567d0..d46838d02 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -5,9 +5,9 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/vm" + "github.com/ethereum/go-ethereum/crypto" ) const tryJit = false @@ -182,10 +182,6 @@ func (self *StateTransition) transitionState() (ret []byte, usedGas *big.Int, er return nil, nil, InvalidTxError(err) } - // Increment the nonce for the next transaction - self.state.SetNonce(sender.Address(), sender.Nonce()+1) - //sender.Nonce += 1 - // Pay data gas var dgas int64 for _, byt := range self.data { @@ -199,12 +195,15 @@ func (self *StateTransition) transitionState() (ret []byte, usedGas *big.Int, er return nil, nil, InvalidTxError(err) } + // Increment the nonce for the next transaction + self.state.SetNonce(sender.Address(), sender.Nonce()+1) + vmenv := self.env var ref vm.ContextRef if MessageCreatesContract(msg) { - contract := makeContract(msg, self.state) - addr := contract.Address() - ret, err, ref = vmenv.Create(sender, &addr, self.msg.Data(), self.gas, self.gasPrice, self.value) + //contract := makeContract(msg, self.state) + //addr := contract.Address() + ret, err, ref = vmenv.Create(sender, nil, self.msg.Data(), self.gas, self.gasPrice, self.value) if err == nil { dataGas := big.NewInt(int64(len(ret))) dataGas.Mul(dataGas, vm.GasCreateByte) |