From 883a488b12653071161a7e2ce4fc38039a2e6be3 Mon Sep 17 00:00:00 2001
From: Alexander Blair <alex@snipanet.com>
Date: Sat, 9 Sep 2017 02:39:13 -0700
Subject: [PATCH] v0.11.0.0 Monero Daemon Release.

---
 deployment/deploy.bash         |  2 +-
 deployment/monero_daemon.patch | 13 ++++++-------
 deployment/upgrade_monero.bash |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/deployment/deploy.bash b/deployment/deploy.bash
index cde098d..21a637a 100644
--- a/deployment/deploy.bash
+++ b/deployment/deploy.bash
@@ -29,7 +29,7 @@ sudo systemctl enable ntp
 cd /usr/local/src
 sudo git clone https://github.com/monero-project/monero.git
 cd monero
-sudo git checkout v0.10.3.1
+sudo git checkout v0.11.0.0
 curl https://raw.githubusercontent.com/Snipa22/nodejs-pool/master/deployment/monero_daemon.patch | sudo git apply -v
 sudo make -j$(nproc)
 sudo cp ~/nodejs-pool/deployment/monero.service /lib/systemd/system/
diff --git a/deployment/monero_daemon.patch b/deployment/monero_daemon.patch
index 7f553ee..b95e685 100644
--- a/deployment/monero_daemon.patch
+++ b/deployment/monero_daemon.patch
@@ -1,14 +1,13 @@
 diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
-index da5e663..f7575e6 100644
+index 4b3fa787..a2340139 100644
 --- a/src/cryptonote_core/tx_pool.cpp
 +++ b/src/cryptonote_core/tx_pool.cpp
-@@ -636,7 +636,7 @@ namespace cryptonote
- 
-     LOG_PRINT_L2("Filling block template, median size " << median_size << ", " << m_txs_by_fee_and_receive_time.size() << " txes in the pool");
+@@ -863,7 +863,7 @@ namespace cryptonote
+     LockedTXN lock(m_blockchain);
+
      auto sorted_it = m_txs_by_fee_and_receive_time.begin();
 -    while (sorted_it != m_txs_by_fee_and_receive_time.end())
 +    while (sorted_it != m_txs_by_fee_and_receive_time.end() && bl.tx_hashes.size() <= 120)
      {
-       auto tx_it = m_transactions.find(sorted_it->second);
-       LOG_PRINT_L2("Considering " << tx_it->first << ", size " << tx_it->second.blob_size << ", current block size " << total_size << "/" << max_total_size << ", current coinbase " << print_money(best_coinbase));
-
+       txpool_tx_meta_t meta = m_blockchain.get_txpool_tx_meta(sorted_it->second);
+       LOG_PRINT_L2("Considering " << sorted_it->second << ", size " << meta.blob_size << ", current block size " << total_size << "/" << max_total_size << ", current coinbase " << print_money(best_coinbase));
diff --git a/deployment/upgrade_monero.bash b/deployment/upgrade_monero.bash
index cef3a82..3f9dfae 100644
--- a/deployment/upgrade_monero.bash
+++ b/deployment/upgrade_monero.bash
@@ -6,7 +6,7 @@ cd /usr/local/src/monero
 sudo git checkout .
 sudo git checkout master
 sudo git pull
-sudo git checkout v0.10.3.1
+sudo git checkout v0.11.0.0
 curl -L https://raw.githubusercontent.com/Snipa22/nodejs-pool/master/deployment/monero_daemon.patch | sudo git apply -v
 sudo rm -rf build
 sudo make -j$(nproc)