Adding support for 10.3.1

Adding keepalive support for the remote_comms sockets, allowing them to reuse the TCP/SSL connection for much better performance in high-load environments.
master
Alexander Blair 7 years ago
parent 1cb4aca08e
commit 01dfbbbcc5

@ -1,5 +1,5 @@
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 3abd3a9..9fa1e00 100644
index e943c961..03381c4c 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -628,7 +628,7 @@ namespace cryptonote
@ -7,7 +7,7 @@ index 3abd3a9..9fa1e00 100644
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)
+ 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));
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));

@ -4,7 +4,7 @@ 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 git checkout .
sudo git checkout v0.10.2.1
sudo git checkout v0.10.3.1
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)

@ -7,7 +7,7 @@ function Database() {
this.sendQueue = async.queue(function (task, callback) {
async.doUntil(
function (intCallback) {
request.post({url: global.config.general.shareHost, body: task.body}, function (error, response, body) {
request.post({url: global.config.general.shareHost, body: task.body, forever: true}, function (error, response, body) {
if (!error) {
return intCallback(null, response.statusCode);
}

Loading…
Cancel
Save