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

Merge ethereum/poc-9 into accounts-integration

Browse Source 
Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go
This commit is contained in:
Felix Lange
2015-03-09 23:25:46 +01:00
parent cd51860bf0 676a0de58d
commit 9bf513e993
84 changed files with 25638 additions and 6387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/state_transition.go
View File

@ -184,7 +184,7 @@ func (self *StateTransition) TransitionState() (ret []byte, err error) {
}
}
if err = self.UseGas(big.NewInt(dgas)); err != nil {
return
return nil, InvalidTxError(err)
}
//stateCopy := self.env.State().Copy()
@ -230,10 +230,16 @@ func (self *StateTransition) TransitionState() (ret []byte, err error) {
*/
}
if err != nil {
self.UseGas(self.gas)
if err != nil && IsValueTransferErr(err) {
return nil, InvalidTxError(err)
}
/*
if err != nil {
self.UseGas(self.gas)
}
*/
return
}