aboutsummaryrefslogtreecommitdiffstats
path: root/internal/ethapi
diff options
context:
space:
mode:
authorMartin Holst Swende <martin@swende.se>2019-06-24 16:54:06 +0800
committerPéter Szilágyi <peterke@gmail.com>2019-06-24 16:54:06 +0800
commitf578d41ee6b3087f8021fd561a0b5665aea3dba6 (patch)
tree1aa79736761c5a6f4c5d1cb14c2e11d05b538740 /internal/ethapi
parentcdadf57bf9d25744eaafddea34a4a66fead9f04b (diff)
downloadgo-tangerine-f578d41ee6b3087f8021fd561a0b5665aea3dba6.tar
go-tangerine-f578d41ee6b3087f8021fd561a0b5665aea3dba6.tar.gz
go-tangerine-f578d41ee6b3087f8021fd561a0b5665aea3dba6.tar.bz2
go-tangerine-f578d41ee6b3087f8021fd561a0b5665aea3dba6.tar.lz
go-tangerine-f578d41ee6b3087f8021fd561a0b5665aea3dba6.tar.xz
go-tangerine-f578d41ee6b3087f8021fd561a0b5665aea3dba6.tar.zst
go-tangerine-f578d41ee6b3087f8021fd561a0b5665aea3dba6.zip
core/vm, internal/ethapi: fail on eth_call when it times out, fixes #19186 (#19737)
Diffstat (limited to 'internal/ethapi')
-rw-r--r--internal/ethapi/api.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index 4132ff144..338223fd5 100644
--- 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
}