use context deadline for timeout in eth_call

cerc-io · Oct 12, 2020 · 7c0492a · 7c0492a
1 parent 1552c61
commit 7c0492a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -879,7 +879,12 @@ func (s *PublicBlockChainAPI) Call(ctx context.Context, args CallArgs, blockNrOr
 	if overrides != nil {
 		accounts = *overrides
 	}
-	result, _, _, err := DoCall(ctx, s.b, args, blockNrOrHash, accounts, vm.Config{}, 5*time.Second, s.b.RPCGasCap())
+	timeout := 5 * time.Second
+	d, ok := ctx.Deadline()
+	if ok {
+		timeout = d.Sub(time.Now())
+	}
+	result, _, _, err := DoCall(ctx, s.b, args, blockNrOrHash, accounts, vm.Config{}, timeout, s.b.RPCGasCap())
 	return (hexutil.Bytes)(result), err
 }