roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Return proper error

Browse Source
This commit is contained in:
obscuren 2015-03-13 17:47:11 +01:00
parent a0266489b4
commit 03403399fc
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/chain_manager.go
View File

@ -449,6 +449,8 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
*/ */
self.setTransState(state.New(block.Root(), self.stateDb)) self.setTransState(state.New(block.Root(), self.stateDb))
self.setTxState(state.New(block.Root(), self.stateDb))
queue[i] = ChainEvent{block} queue[i] = ChainEvent{block}
queueEvent.canonicalCount++ queueEvent.canonicalCount++
} else { } else {

2
core/error.go
View File

@ -78,7 +78,7 @@ func (err *NonceErr) Error() string {
} }
func NonceError(is, exp uint64) *NonceErr { func NonceError(is, exp uint64) *NonceErr {
return &NonceErr{Message: fmt.Sprintf("Nonce err. Is %d, expected %d", is, exp), Is: is, Exp: exp} return &NonceErr{Message: fmt.Sprintf("Transaction w/ invalid nonce (%d / %d)", is, exp), Is: is, Exp: exp}
} }
func IsNonceErr(err error) bool { func IsNonceErr(err error) bool {

3
core/state_transition.go
View File

@ -148,6 +148,9 @@ func (self *StateTransition) preCheck() (err error) {
// Pre-pay gas / Buy gas of the coinbase account // Pre-pay gas / Buy gas of the coinbase account
if err = self.BuyGas(); err != nil { if err = self.BuyGas(); err != nil {
if state.IsGasLimitErr(err) {
return err
}
return InvalidTxError(err) return InvalidTxError(err)
} }

1
miner/worker.go
View File

@ -212,6 +212,7 @@ gasLimit:
fallthrough fallthrough
case core.IsInvalidTxErr(err): case core.IsInvalidTxErr(err):
// Remove invalid transactions // Remove invalid transactions
self.chain.TxState().RemoveNonce(tx.From(), tx.Nonce())
remove = append(remove, tx) remove = append(remove, tx)
case state.IsGasLimitErr(err): case state.IsGasLimitErr(err):
// Break on gas limit // Break on gas limit