diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-12-01 20:26:17 +0100 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-12-01 20:30:54 +0100 |
commit | 4077ad20d03f0ef61d48ef34b3107661b0ff8ffe (patch) | |
tree | 0cf289e53969878180a50a36cb264e084b0179f6 /src/main.h | |
parent | 16f4a6e0fe267e38d14f887e124ee9ca8894267a (diff) | |
parent | 553cad94e29c33872b60d97b8574ed2773355f0b (diff) | |
download | bitcoin-4077ad20d03f0ef61d48ef34b3107661b0ff8ffe.tar.xz |
Merge pull request #6898
553cad9 Rewrite CreateNewBlock (Alex Morcos)
5f12263 Expose FormatStateMessage (Alex Morcos)
1f09287 Make accessing mempool parents and children public (Alex Morcos)
7230187 Add TxPriority class and comparator (Alex Morcos)
f3fe836 Add a score index to the mempool. (Alex Morcos)
c49d5bc Store the total sig op count of a tx. (Alex Morcos)
Diffstat (limited to 'src/main.h')
-rw-r--r-- | src/main.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.h b/src/main.h index 16dff28363..19623f4d96 100644 --- a/src/main.h +++ b/src/main.h @@ -257,6 +257,8 @@ void PruneAndFlush(); bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree, bool* pfMissingInputs, bool fOverrideMempoolLimit=false, bool fRejectAbsurdFee=false); +/** Convert CValidationState to a human-readable message for logging */ +std::string FormatStateMessage(const CValidationState &state); struct CNodeStateStats { int nMisbehavior; |