forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f17366534e into 7f79d249a6

Browse source
This commit is contained in:
bas-vk 2016-12-05 19:08:22 +00:00 committed by GitHub
commit 9b47a010aa
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/state_processor.go
View file

@ -97,7 +97,7 @@ func ApplyTransaction(config *params.ChainConfig, bc *BlockChain, gp *GasPool, s
return nil, nil, nil, err return nil, nil, nil, err
} }
_, gas, err := ApplyMessage(NewEnv(statedb, config, bc, msg, header, cfg), msg, gp) ret, gas, err := ApplyMessage(NewEnv(statedb, config, bc, msg, header, cfg), msg, gp)
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }
@ -107,7 +107,9 @@ func ApplyTransaction(config *params.ChainConfig, bc *BlockChain, gp *GasPool, s
receipt := types.NewReceipt(statedb.IntermediateRoot(config.IsEIP158(header.Number)).Bytes(), usedGas) receipt := types.NewReceipt(statedb.IntermediateRoot(config.IsEIP158(header.Number)).Bytes(), usedGas)
receipt.TxHash = tx.Hash() receipt.TxHash = tx.Hash()
receipt.GasUsed = new(big.Int).Set(gas) receipt.GasUsed = new(big.Int).Set(gas)
if MessageCreatesContract(msg) {
// ret is only not nil when the contract is deployed successful.
if MessageCreatesContract(msg) && ret != nil {
receipt.ContractAddress = crypto.CreateAddress(msg.From(), tx.Nonce()) receipt.ContractAddress = crypto.CreateAddress(msg.From(), tx.Nonce())
} }

2
core/state_transition.go
View file

@ -235,6 +235,8 @@ func (self *StateTransition) TransitionDb() (ret []byte, requiredGas, usedGas *b
if err != nil { if err != nil {
ret = nil ret = nil
glog.V(logger.Core).Infoln("VM create err:", err) glog.V(logger.Core).Infoln("VM create err:", err)
} else if ret == nil { // contract deployed without code
ret = []byte{}
} }
} else { } else {
// Increment the nonce for the next transaction // Increment the nonce for the next transaction