Return proper error

pull/481/head
obscuren 10 years ago
parent a0266489b4
commit 03403399fc
  1. 2
      core/chain_manager.go
  2. 2
      core/error.go
  3. 3
      core/state_transition.go
  4. 1
      miner/worker.go

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

@ -78,7 +78,7 @@ func (err *NonceErr) Error() string {
}
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 {

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

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

Loading…
Cancel
Save