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 1/3] 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

From 140a1db71cf2df17440dd897cd1d9b1bac299d52 Mon Sep 17 00:00:00 2001
From: Javier Smooth <iamjaviersmooth@gmail.com>
Date: Wed, 4 Nov 2015 23:22:40 -0800
Subject: [PATCH 2/3] Do not create transactions larger than the size of the
 penalty free zone In order to observe block size pressure due to transactions
 volumes, it is helpful to keep individual transaction sizes somewhat smaller
 so multiple transactions are more likely to be packed into a block.

---
 src/wallet/wallet2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 367bc24..855ec2e 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -142,7 +142,7 @@ namespace tools
     // free block size. TODO: fix this so that it actually takes
     // into account the current median block size rather than
     // the minimum block size.
-    void init(const std::string& daemon_address = "http://localhost:8080", uint64_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE);
+    void init(const std::string& daemon_address = "http://localhost:8080", uint64_t upper_transaction_size_limit = CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE);
     bool deinit();
 
     void stop() { m_run.store(false, std::memory_order_relaxed); }

From 5e08db9a040bdc5bb5c916b6c7a8509d1d648844 Mon Sep 17 00:00:00 2001
From: Javier Smooth <iamjaviersmooth@gmail.com>
Date: Wed, 4 Nov 2015 23:25:17 -0800
Subject: [PATCH 3/3] Bump version

---
 src/version.h.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/version.h.in b/src/version.h.in
index dbe44a5..b7ec66c 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -1,4 +1,4 @@
 #define BUILD_COMMIT_ID "@VERSION@"
-#define PROJECT_VERSION "0.9.5"
+#define PROJECT_VERSION "0.9.6"
 #define PROJECT_VERSION_BUILD_NO "0"
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO "(" BUILD_COMMIT_ID ")"