sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 13:32:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add absurdly high fee message to validation state (for RPC propagation)

Browse Source
This commit is contained in:
Shaul Kfir 2015-03-16 21:36:43 -04:00
parent da77a6f761
commit a651403e09
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/consensus/validation.h
View File

@ -28,12 +28,12 @@ private:
} mode; } mode;
int nDoS; int nDoS;
std::string strRejectReason; std::string strRejectReason;
unsigned char chRejectCode; unsigned int chRejectCode;
bool corruptionPossible; bool corruptionPossible;
public: public:
CValidationState() : mode(MODE_VALID), nDoS(0), chRejectCode(0), corruptionPossible(false) {} CValidationState() : mode(MODE_VALID), nDoS(0), chRejectCode(0), corruptionPossible(false) {}
bool DoS(int level, bool ret = false, bool DoS(int level, bool ret = false,
unsigned char chRejectCodeIn=0, std::string strRejectReasonIn="", unsigned int chRejectCodeIn=0, std::string strRejectReasonIn="",
bool corruptionIn=false) { bool corruptionIn=false) {
chRejectCode = chRejectCodeIn; chRejectCode = chRejectCodeIn;
strRejectReason = strRejectReasonIn; strRejectReason = strRejectReasonIn;
@ -45,7 +45,7 @@ public:
return ret; return ret;
} }
bool Invalid(bool ret = false, bool Invalid(bool ret = false,
unsigned char _chRejectCode=0, std::string _strRejectReason="") { unsigned int _chRejectCode=0, std::string _strRejectReason="") {
return DoS(0, ret, _chRejectCode, _strRejectReason); return DoS(0, ret, _chRejectCode, _strRejectReason);
} }
bool Error(const std::string& strRejectReasonIn) { bool Error(const std::string& strRejectReasonIn) {
@ -73,7 +73,7 @@ public:
bool CorruptionPossible() const { bool CorruptionPossible() const {
return corruptionPossible; return corruptionPossible;
} }
unsigned char GetRejectCode() const { return chRejectCode; } unsigned int GetRejectCode() const { return chRejectCode; }
std::string GetRejectReason() const { return strRejectReason; } std::string GetRejectReason() const { return strRejectReason; }
}; };

5
src/main.cpp
View File

@ -1031,9 +1031,10 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
} }
if (fRejectAbsurdFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000) if (fRejectAbsurdFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000)
return error("AcceptToMemoryPool: absurdly high fees %s, %d > %d", return state.Invalid(error("AcceptToMemoryPool: absurdly high fees %s, %d > %d",
hash.ToString(), hash.ToString(),
nFees, ::minRelayTxFee.GetFee(nSize) * 10000); nFees, ::minRelayTxFee.GetFee(nSize) * 10000),
REJECT_HIGHFEE, "absurdly-high-fee");
// Check against previous transactions // Check against previous transactions
// This is done last to help prevent CPU exhaustion denial-of-service attacks. // This is done last to help prevent CPU exhaustion denial-of-service attacks.

3
src/main.h
View File

@ -497,4 +497,7 @@ extern CBlockTreeDB *pblocktree;
*/ */
int GetSpendHeight(const CCoinsViewCache& inputs); int GetSpendHeight(const CCoinsViewCache& inputs);
/** local "reject" message codes for RPC which can not be triggered by p2p trasactions */
static const unsigned int REJECT_HIGHFEE = 0x100;
#endif // BITCOIN_MAIN_H #endif // BITCOIN_MAIN_H