diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-10-26 17:57:29 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-10-26 17:57:56 +0200 |
| commit | e1c29c94ad6d42ceb2ce3516048fbfd272738b47 (patch) | |
| tree | 63687d9d22b403d8b34cef3f2534bbf3b8e84023 /src/wallet | |
| parent | Merge pull request #442 (diff) | |
| parent | Fix leak on real output when using a very recent output (diff) | |
| download | monero-e1c29c94ad6d42ceb2ce3516048fbfd272738b47.tar.xz | |
Merge pull request #444
ecbb732 Fix leak on real output when using a very recent output (moneromooo-monero)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index cca409d9a..92777d16b 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -1073,7 +1073,7 @@ bool wallet2::is_transfer_unlocked(const transfer_details& td) const if(!is_tx_spendtime_unlocked(td.m_tx.unlock_time)) return false; - if(td.m_block_height + DEFAULT_TX_SPENDABLE_AGE > m_blockchain.size()) + if(td.m_block_height + CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE > m_blockchain.size()) return false; return true; diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 0bffa7f12..a8c7f9b78 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -50,7 +50,6 @@ #include "wallet_errors.h" #include <iostream> -#define DEFAULT_TX_SPENDABLE_AGE 10 #define WALLET_RCP_CONNECTION_TIMEOUT 200000 namespace tools |