From f3f09bde9888507f9769eb4e2dddc5c9d15e81b6 Mon Sep 17 00:00:00 2001
From: Javier Smooth <iamjaviersmooth@gmail.com>
Date: Mon, 12 Oct 2015 06:38:31 -0700
Subject: [PATCH] Use DEFAULT_TX_SPENDABLE_AGE rather than
 CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW for mixin selection

---
 src/cryptonote_config.h                    | 2 ++
 src/cryptonote_core/blockchain_storage.cpp | 2 +-
 src/wallet/wallet2.h                       | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
index 43709f2..453d8d2 100644
--- a/src/cryptonote_config.h
+++ b/src/cryptonote_config.h
@@ -123,3 +123,5 @@
 #define THREAD_STACK_SIZE                       5 * 1024 * 1024
 
 #define CONFIG_DONATION_ADDRESS                 "WmsSWgtT1JPg5e3cK41hKXSHVpKW7e47bjgiKmWZkYrhSS5LhRemNyqayaSBtAQ6517eo5PtH9wxHVmM78JDZSUu2W8PqRiNs"
+
+#define DEFAULT_TX_SPENDABLE_AGE                10
diff --git a/src/cryptonote_core/blockchain_storage.cpp b/src/cryptonote_core/blockchain_storage.cpp
index 79485cf..6dd9002 100644
--- a/src/cryptonote_core/blockchain_storage.cpp
+++ b/src/cryptonote_core/blockchain_storage.cpp
@@ -989,7 +989,7 @@ size_t blockchain_storage::find_end_of_allowed_index(const std::vector<std::pair
     --i;
     transactions_container::iterator it = m_transactions.find(amount_outs[i].first);
     CHECK_AND_ASSERT_MES(it != m_transactions.end(), 0, "internal error: failed to find transaction from outputs index with tx_id=" << amount_outs[i].first);
-    if(it->second.m_keeper_block_height + CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW <= get_current_blockchain_height() )
+    if(it->second.m_keeper_block_height + DEFAULT_TX_SPENDABLE_AGE <= get_current_blockchain_height() )
       return i+1;
   } while (i != 0);
   return 0;
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 9b1ee6c..367bc24 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