diff options
| author | João Barbosa <[email protected]> | 2018-01-11 14:16:44 +0000 |
|---|---|---|
| committer | João Barbosa <[email protected]> | 2019-01-04 14:58:48 +0000 |
| commit | f12e1d0b5117e3688f52a25ed0170d76ecdbf233 (patch) | |
| tree | e7320b20966991aa79636f6be58cc0427000a614 /src | |
| parent | Merge #12151: rpc: Remove cs_main lock from blockToJSON and blockheaderToJSON (diff) | |
| download | discoin-f12e1d0b5117e3688f52a25ed0170d76ecdbf233.tar.xz discoin-f12e1d0b5117e3688f52a25ed0170d76ecdbf233.zip | |
rpc: Avoid permanent cs_main lock in getblockheader
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/blockchain.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 55282f433..086c305fc 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -747,15 +747,20 @@ static UniValue getblockheader(const JSONRPCRequest& request) + HelpExampleRpc("getblockheader", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\"") ); - LOCK(cs_main); - uint256 hash(ParseHashV(request.params[0], "hash")); bool fVerbose = true; if (!request.params[1].isNull()) fVerbose = request.params[1].get_bool(); - const CBlockIndex* pblockindex = LookupBlockIndex(hash); + const CBlockIndex* pblockindex; + const CBlockIndex* tip; + { + LOCK(cs_main); + pblockindex = LookupBlockIndex(hash); + tip = chainActive.Tip(); + } + if (!pblockindex) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found"); } @@ -768,7 +773,7 @@ static UniValue getblockheader(const JSONRPCRequest& request) return strHex; } - return blockheaderToJSON(chainActive.Tip(), pblockindex); + return blockheaderToJSON(tip, pblockindex); } static CBlock GetBlockChecked(const CBlockIndex* pblockindex) |