github-jwinterm/nodejs-pool
1
0
Fork 0
mirror of https://github.com/jwinterm/nodejs-pool.git synced 2026-10-17 05:21:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

v0.11.0.0 Monero Daemon Release.

Browse Source
This commit is contained in:
Alexander Blair
2017-09-09 02:39:13 -07:00
parent 9c641aca00
commit 883a488b12
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/deploy.bash
+1 -1
View File
@@ -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/
deployment/monero_daemon.patch
+6 -7
View File
@@ -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));
deployment/upgrade_monero.bash
+1 -1
View File
@@ -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)