core/vm, internal/ethapi: fail on eth_call when it times out, fixes #19186 (#19737)

2019-06-24 10:54:06 +02:00
parent cdadf57bf9
commit f578d41ee6
2 changed files with 9 additions and 0 deletions
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@ -802,6 +802,10 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNr rpc.BlockNumb
 	if err := vmError(); err != nil {
 		return nil, 0, false, err
 	}
+	// If the timer caused an abort, return an appropriate error message
+	if evm.Cancelled() {
+		return nil, 0, false, fmt.Errorf("execution aborted (timeout = %v)", timeout)
+	}
 	return res, gas, failed, err
 }