diff options
| author | João Barbosa <joao.paulo.barbosa@gmail.com> | 2018-01-11 22:23:19 +0000 |
|---|---|---|
| committer | João Barbosa <joao.paulo.barbosa@gmail.com> | 2018-09-09 18:02:24 +0100 |
| commit | b9f226b41f989f5c07fe57801701a39c14a6e173 (patch) | |
| tree | 948a78b3718a6bbddeb367bff7ff7e1270544ac9 /src/rpc/blockchain.h | |
| parent | 343b98cbcd52854ffffaca7ada72f5522117ac7f (diff) | |
| download | bitcoin-b9f226b41f989f5c07fe57801701a39c14a6e173.tar.xz | |
rpc: Remove cs_main lock from blockToJSON and blockHeaderToJSON
Diffstat (limited to 'src/rpc/blockchain.h')
| -rw-r--r-- | src/rpc/blockchain.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h index add335eb8a..529132d033 100644 --- a/src/rpc/blockchain.h +++ b/src/rpc/blockchain.h @@ -27,7 +27,7 @@ double GetDifficulty(const CBlockIndex* blockindex); void RPCNotifyBlockChange(bool ibd, const CBlockIndex *); /** Block description to JSON */ -UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails = false); +UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIndex* blockindex, bool txDetails = false); /** Mempool information to JSON */ UniValue mempoolInfoToJSON(); @@ -36,7 +36,7 @@ UniValue mempoolInfoToJSON(); UniValue mempoolToJSON(bool fVerbose = false); /** Block header to JSON */ -UniValue blockheaderToJSON(const CBlockIndex* blockindex); +UniValue blockheaderToJSON(const CBlockIndex* tip, const CBlockIndex* blockindex); /** Used by getblockstats to get feerates at different percentiles by weight */ void CalculatePercentilesByWeight(CAmount result[NUM_GETBLOCKSTATS_PERCENTILES], std::vector<std::pair<CAmount, int64_t>>& scores, int64_t total_weight); |