Submit merge mined blocks asynchronously

src/miner.cpp

@@ -245,7 +245,7 @@ void Miner::run(WorkerData* data)
 			for (const AuxChainData& aux_data : j.m_auxChains) {
 				if (aux_data.difficulty.check_pow(h)) {
 					LOGINFO(0, log::Green() << "AUX BLOCK FOUND: chain_id " << aux_data.unique_id << ", diff " << j.m_auxDiff << ", worker thread " << data->m_index << '/' << data->m_count);
-					m_pool->submit_aux_block(aux_data.unique_id, j.m_templateId, j.m_nonce, j.m_extraNonce);
+					m_pool->submit_aux_block_async(aux_data.unique_id, j.m_templateId, j.m_nonce, j.m_extraNonce);
 				}
 			}
 		}

src/p2pool.cpp

@@ -114,6 +114,13 @@ p2pool::p2pool(int argc, char* argv[])
 	}
 	m_submitBlockAsync.data = this;
 
+	err = uv_async_init(uv_default_loop_checked(), &m_submitAuxBlockAsync, on_submit_aux_block);
+	if (err) {
+		LOGERR(1, "uv_async_init failed, error " << uv_err_name(err));
+		throw std::exception();
+	}
+	m_submitAuxBlockAsync.data = this;
+
 	err = uv_async_init(uv_default_loop_checked(), &m_blockTemplateAsync, on_update_block_template);
 	if (err) {
 		LOGERR(1, "uv_async_init failed, error " << uv_err_name(err));
@@ -145,6 +152,7 @@ p2pool::p2pool(int argc, char* argv[])
 	uv_mutex_init_checked(&m_minerLock);
 #endif
 	uv_mutex_init_checked(&m_submitBlockDataLock);
+	uv_mutex_init_checked(&m_submitAuxBlockDataLock);
 
 	m_api = p->m_apiPath.empty() ? nullptr : new p2pool_api(p->m_apiPath, p->m_localStats);
 
@@ -215,6 +223,7 @@ p2pool::~p2pool()
 	uv_mutex_destroy(&m_minerLock);
 #endif
 	uv_mutex_destroy(&m_submitBlockDataLock);
+	uv_mutex_destroy(&m_submitAuxBlockDataLock);
 
 	delete m_api;
 	delete m_sideChain;
@@ -627,8 +636,40 @@ void p2pool::submit_block_async(std::vector<uint8_t>&& blob)
 	}
 }
 
-void p2pool::submit_aux_block(const hash& chain_id, uint32_t template_id, uint32_t nonce, uint32_t extra_nonce) const
+void p2pool::submit_aux_block_async(const hash& chain_id, uint32_t template_id, uint32_t nonce, uint32_t extra_nonce)
 {
+	{
+		MutexLock lock(m_submitAuxBlockDataLock);
+		m_submitAuxBlockData.emplace_back(SubmitAuxBlockData{ chain_id, template_id, nonce, extra_nonce });
+	}
+
+	// If p2pool is stopped, m_submitAuxBlockAsync is most likely already closed
+	if (m_stopped) {
+		LOGWARN(0, "p2pool is shutting down, but a block was found. Trying to submit it anyway!");
+		submit_aux_block();
+		return;
+	}
+
+	const int err = uv_async_send(&m_submitAuxBlockAsync);
+	if (err) {
+		LOGERR(1, "uv_async_send failed, error " << uv_err_name(err));
+	}
+}
+
+void p2pool::submit_aux_block() const
+{
+	std::vector<SubmitAuxBlockData> submit_data;
+	{
+		MutexLock lock(m_submitAuxBlockDataLock);
+		m_submitAuxBlockData.swap(submit_data);
+	}
+
+	for (size_t i = 0; i < submit_data.size(); ++i) {
+		const hash chain_id = submit_data[i].chain_id;
+		const uint32_t template_id = submit_data[i].template_id;
+		const uint32_t nonce = submit_data[i].nonce;
+		const uint32_t extra_nonce = submit_data[i].extra_nonce;
+
 		LOGINFO(3, "submit_aux_block: template id = " << template_id << ", chain_id = " << chain_id << ", nonce = " << nonce << ", extra_nonce = " << extra_nonce);
 
 		size_t nonce_offset = 0;
@@ -692,6 +733,7 @@ void p2pool::submit_aux_block(const hash& chain_id, uint32_t template_id, uint32
 				return;
 			}
 		}
+	}
 }
 
 bool init_signals(p2pool* pool, bool init);
@@ -707,6 +749,7 @@ void p2pool::on_stop(uv_async_t* async)
 	}
 
 	uv_close(reinterpret_cast<uv_handle_t*>(&pool->m_submitBlockAsync), nullptr);
+	uv_close(reinterpret_cast<uv_handle_t*>(&pool->m_submitAuxBlockAsync), nullptr);
 	uv_close(reinterpret_cast<uv_handle_t*>(&pool->m_blockTemplateAsync), nullptr);
 	uv_close(reinterpret_cast<uv_handle_t*>(&pool->m_stopAsync), nullptr);
 	uv_close(reinterpret_cast<uv_handle_t*>(&pool->m_reconnectToHostAsync), nullptr);

src/p2pool.h

@@ -89,7 +89,7 @@ public:
 	void submit_block_async(uint32_t template_id, uint32_t nonce, uint32_t extra_nonce);
 	void submit_block_async(std::vector<uint8_t>&& blob);
 
-	void submit_aux_block(const hash& chain_id, uint32_t template_id, uint32_t nonce, uint32_t extra_nonce) const;
+	void submit_aux_block_async(const hash& chain_id, uint32_t template_id, uint32_t nonce, uint32_t extra_nonce);
 
 	bool submit_sidechain_block(uint32_t template_id, uint32_t nonce, uint32_t extra_nonce);
 
@@ -123,11 +123,13 @@ private:
 	const Params::Host& switch_host();
 
 	static void on_submit_block(uv_async_t* async) { reinterpret_cast<p2pool*>(async->data)->submit_block(); }
+	static void on_submit_aux_block(uv_async_t* async) { reinterpret_cast<p2pool*>(async->data)->submit_aux_block(); }
 	static void on_update_block_template(uv_async_t* async) { reinterpret_cast<p2pool*>(async->data)->update_block_template(); }
 	static void on_stop(uv_async_t*);
 	static void on_reconnect_to_host(uv_async_t* async) { reinterpret_cast<p2pool*>(async->data)->reconnect_to_host(); }
 
 	void submit_block() const;
+	void submit_aux_block() const;
 
 	std::atomic<bool> m_stopped;
 
@@ -219,7 +221,19 @@ private:
 	mutable uv_mutex_t m_submitBlockDataLock;
 	SubmitBlockData m_submitBlockData;
 
+	struct SubmitAuxBlockData
+	{
+		hash chain_id;
+		uint32_t template_id = 0;
+		uint32_t nonce = 0;
+		uint32_t extra_nonce = 0;
+	};
+
+	mutable uv_mutex_t m_submitAuxBlockDataLock;
+	mutable std::vector<SubmitAuxBlockData> m_submitAuxBlockData;
+
 	uv_async_t m_submitBlockAsync;
+	uv_async_t m_submitAuxBlockAsync;
 	uv_async_t m_blockTemplateAsync;
 	uv_async_t m_stopAsync;
 

src/stratum_server.cpp

@@ -407,7 +407,7 @@ bool StratumServer::on_submit(StratumClient* client, uint32_t id, const char* jo
 				if (aux_data.difficulty.check_pow(resultHash)) {
 					const char* s = client->m_customUser;
 					LOGINFO(0, log::Green() << "client " << static_cast<char*>(client->m_addrString) << (*s ? " user " : "") << s << " found an aux block for chain_id " << aux_data.unique_id << ", diff " << aux_data.difficulty << ", submitting it");
-					m_pool->submit_aux_block(aux_data.unique_id, template_id, nonce, extra_nonce);
+					m_pool->submit_aux_block_async(aux_data.unique_id, template_id, nonce, extra_nonce);
 				}
 			}
 		}