lthn/mining-pool
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to add fix for the 128 txn bug.

Browse source
This commit is contained in:
Alexander Blair 2017-02-28 07:18:39 -08:00
parent 3446d35adc
commit b1d85e38f0
4 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
deployment/deploy.bash
View file

@ -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

1
deployment/leaf.bash
View file

@ -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

13
deployment/monero_daemon.patch Normal file
View file

@ -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));

11
deployment/upgrade_monero.bash Normal file
View file

@ -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!"