From b1d85e38f0b5fa4a17a9f31ad6589ca809daf5e2 Mon Sep 17 00:00:00 2001
From: Alexander Blair <alexander.blair@youcallmd.com>
Date: Tue, 28 Feb 2017 07:18:39 -0800
Subject: [PATCH] Update to add fix for the 128 txn bug.

---
 deployment/deploy.bash         |  1 +
 deployment/leaf.bash           |  1 +
 deployment/monero_daemon.patch | 13 +++++++++++++
 deployment/upgrade_monero.bash | 11 +++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 deployment/monero_daemon.patch
 create mode 100644 deployment/upgrade_monero.bash

diff --git a/deployment/deploy.bash b/deployment/deploy.bash
index 213ef18..3f9cf84 100644
--- a/deployment/deploy.bash
+++ b/deployment/deploy.bash
@@ -30,6 +30,7 @@ cd /usr/local/src
 sudo git clone https://github.com/monero-project/monero.git
 cd monero
 sudo git checkout v0.10.2.1
+curl https://raw.githubusercontent.com/Snipa22/nodejs-pool/master/deployment/monero_daemon.patch | sudo git apply -v --index
 sudo make -j$(nproc)
 sudo cp ~/nodejs-pool/deployment/monero.service /lib/systemd/system/
 sudo useradd -m monerodaemon -d /home/monerodaemon
diff --git a/deployment/leaf.bash b/deployment/leaf.bash
index 803cdf3..3176b5e 100644
--- a/deployment/leaf.bash
+++ b/deployment/leaf.bash
@@ -26,6 +26,7 @@ cd /usr/local/src
 sudo git clone https://github.com/monero-project/monero.git
 cd monero
 sudo git checkout v0.10.2.1
+curl https://raw.githubusercontent.com/Snipa22/nodejs-pool/master/deployment/monero_daemon.patch | sudo git apply -v --index
 sudo make -j$(nproc)
 sudo cp ~/nodejs-pool/deployment/monero.service /lib/systemd/system/
 sudo useradd -m monerodaemon -d /home/monerodaemon
diff --git a/deployment/monero_daemon.patch b/deployment/monero_daemon.patch
new file mode 100644
index 0000000..c23875e
--- /dev/null
+++ b/deployment/monero_daemon.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
+index 3abd3a9..9fa1e00 100644
+--- a/src/cryptonote_core/tx_pool.cpp
++++ b/src/cryptonote_core/tx_pool.cpp
+@@ -628,7 +628,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");
+     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));
\ No newline at end of file
diff --git a/deployment/upgrade_monero.bash b/deployment/upgrade_monero.bash
new file mode 100644
index 0000000..675faa9
--- /dev/null
+++ b/deployment/upgrade_monero.bash
@@ -0,0 +1,11 @@
+#!/bin/bash
+echo "This assumes that you have a standard nodejs-pool install, and will patch and update it to the latest stable builds of Monero."
+sleep 15
+echo "Continuing install, this will prompt you for your password if you didn't enable passwordless sudo.  Please do not run me as root!"
+cd /usr/local/src/monero
+sudo checkout .
+sudo checkout v0.10.2.1
+curl https://raw.githubusercontent.com/Snipa22/nodejs-pool/master/deployment/monero_daemon.patch | sudo git apply -v --index
+sudo rm -rf build
+sudo make -j$(nproc)
+echo "Done building the new Monero daemon!  Please go ahead and reboot monero with: sudo systemctl restart monero as soon as the pool source is updated!"
\ No newline at end of file