diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-08-11 17:36:39 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-08-11 17:36:50 +0200 |
| commit | 87f37e259d6deb52ee464edde7aece687eea97a5 (patch) | |
| tree | 9b3e3f88ffcfe790e7495d63d5ac21faa5fd5852 /src/main.h | |
| parent | 3eaaf71fe76b659d8ed40fdf88ce1ba18b62cc36 (diff) | |
| parent | 7f1f8f5edf36b0885b0f2b746e28a2f9bde8f4f0 (diff) | |
| download | bitcoin-87f37e259d6deb52ee464edde7aece687eea97a5.tar.xz | |
Merge pull request #6519
7f1f8f5 Move mempool rejections to new debug category (Wladimir J. van der Laan)
66daed5 Add information to errors in ConnectBlock, CheckBlock (Wladimir J. van der Laan)
6cab808 Remove most logging from transaction validation (Wladimir J. van der Laan)
9003c7c Add function to convert CValidationState to a human-readable message (Wladimir J. van der Laan)
dc58258 Introduce REJECT_INTERNAL codes for local AcceptToMempool errors (Wladimir J. van der Laan)
fbf44e6 Add debug message to CValidationState for optional extra information (Wladimir J. van der Laan)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index a78a589e16..e3479b4b3b 100644 --- a/src/main.h +++ b/src/main.h @@ -455,7 +455,16 @@ extern CBlockTreeDB *pblocktree; */ int GetSpendHeight(const CCoinsViewCache& inputs); -/** local "reject" message codes for RPC which can not be triggered by p2p trasactions */ +/** Reject codes greater or equal to this can be returned by AcceptToMemPool + * for transactions, to signal internal conditions. They cannot and should not + * be sent over the P2P network. + */ +static const unsigned int REJECT_INTERNAL = 0x100; +/** Too high fee. Can not be triggered by P2P transactions */ static const unsigned int REJECT_HIGHFEE = 0x100; +/** Transaction is already known (either in mempool or blockchain) */ +static const unsigned int REJECT_ALREADY_KNOWN = 0x101; +/** Transaction conflicts with a transaction already known */ +static const unsigned int REJECT_CONFLICT = 0x102; #endif // BITCOIN_MAIN_H |