diff options
| author | instagibbs <[email protected]> | 2016-10-25 14:27:04 -0400 |
|---|---|---|
| committer | instagibbs <[email protected]> | 2016-10-26 15:59:33 -0400 |
| commit | 169bdabe14ef5988ff92a7370114edc85b070b27 (patch) | |
| tree | 1a077ce1f422e2bad2006d282f0ea32f1f918f3f /src/wallet/wallet.h | |
| parent | Merge #8982: Eliminating Inconsistencies in Textual Output (diff) | |
| download | discoin-169bdabe14ef5988ff92a7370114edc85b070b27.tar.xz discoin-169bdabe14ef5988ff92a7370114edc85b070b27.zip | |
Return useful error message on ATMP failure
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 3b37f7cb1..c33a6ca91 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -215,7 +215,7 @@ public: bool IsInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet) > 0; } int GetBlocksToMaturity() const; /** Pass this transaction to the mempool. Fails if absolute fee exceeds absurd fee. */ - bool AcceptToMemoryPool(const CAmount& nAbsurdFee); + bool AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& state); bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); } bool isAbandoned() const { return (hashBlock == ABANDON_HASH); } void setAbandoned() { hashBlock = ABANDON_HASH; } @@ -774,7 +774,7 @@ public: */ bool CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, const CCoinControl *coinControl = NULL, bool sign = true); - bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman); + bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman, CValidationState& state); void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries); bool AddAccountingEntry(const CAccountingEntry&); |