api and p2p deadlock fix

[ucwong]

No description provided.

[codecov]

Codecov Report

Merging #838 (ef9c783) into master (55fbc4b) will increase coverage by 0.00%.
The diff coverage is 85.71%.

@@           Coverage Diff           @@
##           master     #838   +/-   ##
=======================================
  Coverage   49.09%   49.09%           
=======================================
  Files         418      418           
  Lines       47748    47752    +4     
=======================================
+ Hits        23441    23445    +4     
- Misses      22264    22268    +4     
+ Partials     2043     2039    -4     

Impacted Files	Coverage Δ
p2p/discover/v5_udp.go	81.06% <85.71%> (+0.20%)	⬆️
p2p/simulations/mocker.go	16.49% <0.00%> (-12.38%)	⬇️
rlp/raw.go	78.98% <0.00%> (-5.74%)	⬇️
accounts/keystore/watch.go	90.69% <0.00%> (-4.66%)	⬇️
trie/proof.go	73.09% <0.00%> (-1.10%)	⬇️
p2p/peer.go	76.71% <0.00%> (-1.06%)	⬇️
core/tx_pool.go	75.65% <0.00%> (-0.63%)	⬇️
ctxc/downloader/queue.go	80.59% <0.00%> (+0.53%)	⬆️
ctxc/downloader/downloader.go	76.58% <0.00%> (+0.64%)	⬆️
... and 6 more