Merge branch 'dev' into jl777

2018-11-11 00:21:44 -11:00
parent f1d395f5bd 8453af1c13
commit 0e8e56986b
8 changed files with 27 additions and 1 deletions
--- a/src/main.h
+++ b/src/main.h
@@ -916,6 +916,8 @@ extern CBlockTreeDB *pblocktree;
 */
 int GetSpendHeight(const CCoinsViewCache& inputs);

+uint64_t CalculateCurrentUsage();
+
 /** Return a CMutableTransaction with contextual default values based on set of consensus rules at height */
 CMutableTransaction CreateNewContextualCMutableTransaction(const Consensus::Params& consensusParams, int nHeight);