Simplify block transaction sync

crackcomm · crackcomm · commit c6afad943ac5 · 2018-12-30T16:27:19.000+01:00
diff --git a/src/miner/internal/miner-base.cpp b/src/miner/internal/miner-base.cpp
@@ -38,21 +38,21 @@ void MinerBase::Loop()
 
     CBlock block;
     CBlockIndex* chain_tip = nullptr;
-    std::uint64_t block_flag = 0;
+    int64_t block_time = 0;
     std::shared_ptr<CBlockTemplate> block_template = {nullptr};
 
     try {
         while (true) {
             // Update block and tip if changed
-            if (block_flag != _ctx->shared->block_flag()) {
+            if (block_time != _ctx->shared->block_time()) {
                 // set new block template
                 block_template = _ctx->shared->block_template();
                 block = block_template->block;
                 // set block reserve script
                 SetBlockPubkeyScript(block, _coinbase_script->reserveScript);
                 // set block flag only after template
                 // so we've waited for RecreateBlock
-                block_flag = _ctx->shared->block_flag();
+                block_time = _ctx->shared->block_time();
                 // block template chain tip
                 chain_tip = _ctx->shared->tip();
             }
@@ -74,7 +74,7 @@ void MinerBase::Loop()
                 // Check for stop or if block needs to be rebuilt
                 boost::this_thread::interruption_point();
                 // Check if block was recreated
-                if (block_flag != _ctx->shared->block_flag()) {
+                if (block_time != _ctx->shared->block_time()) {
                     break;
                 }
                 // Recreate block if nonce too big
diff --git a/src/miner/internal/miner-context.cpp b/src/miner/internal/miner-context.cpp
@@ -4,6 +4,7 @@
 
 #include "miner/internal/miner-context.h"
 #include "miner/miner-util.h"
+#include "txmempool.h"
 #include "validation.h"
 
 MinerContext::MinerContext(const CChainParams& chainparams_, CConnman& connman_)
@@ -15,12 +16,15 @@ MinerContext::MinerContext(MinerSharedContextRef shared_, HashRateCounterRef cou
 
 void MinerSharedContext::RecreateBlock()
 {
-    // First we increment flag
-    // so all miner threads know new block is coming
-    _block_flag += 1;
     // Then we acquire unique lock so that miners wait
     // for the new block to be created
     boost::unique_lock<boost::shared_mutex> guard(_mutex);
+    uint32_t txn_time = mempool.GetTransactionsUpdated();
+    // pass if nothing changed
+    if (_chain_tip == chainActive.Tip() && _last_txn == txn_time)
+        return;
     _chain_tip = chainActive.Tip();
+    _block_time = GetTime();
     _block_template = CreateNewBlock(chainparams);
+    _last_txn = txn_time;
 }
diff --git a/src/miner/internal/miner-context.h b/src/miner/internal/miner-context.h
@@ -37,12 +37,11 @@ struct MinerSharedContext {
     // Returns chain tip of current block template
     CBlockIndex* tip() const { return _chain_tip; }
 
-    // Returns miner block flag
-    // It's incremented every time new template is generated
-    uint64_t block_flag() const { return _block_flag; }
+    // Returns miner block template creation time
+    int64_t block_time() const { return _block_time; }
 
-    // Returns true if block was created
-    bool has_block() const { return _block_template != nullptr; }
+    // Returns time of last transaction in the block
+    uint32_t last_txn() const { return _last_txn; }
 
     // Returns miner block template
     std::shared_ptr<CBlockTemplate> block_template()
@@ -63,7 +62,9 @@ struct MinerSharedContext {
     // current block chain tip
     std::atomic<CBlockIndex*> _chain_tip{nullptr};
     // atomic flag incremented on recreated block
-    std::atomic<std::uint64_t> _block_flag{0};
+    std::atomic<int64_t> _block_time{0};
+    // last transaction update time
+    std::atomic<uint32_t> _last_txn{0};
     // shared block template for miners
     std::shared_ptr<CBlockTemplate> _block_template{nullptr};
     // mutex protecting multiple threads recreating block
diff --git a/src/miner/internal/miners-controller.cpp b/src/miner/internal/miners-controller.cpp
@@ -7,7 +7,6 @@
 #include "miner/internal/miner-context.h"
 #include "miner/miner-util.h"
 #include "net.h"
-#include "txmempool.h"
 #include "validation.h"
 #include "validationinterface.h"
 
@@ -27,6 +26,9 @@ void MinersController::Start()
 {
     _enable_start = true;
     _signals = std::make_shared<MinerSignals>(this);
+    // initialize block template
+    _ctx->shared->RecreateBlock();
+
     if (can_start()) {
         _group_cpu.Start();
 #ifdef ENABLE_GPU
@@ -78,8 +80,6 @@ void MinerSignals::NotifyBlock(const CBlockIndex* index_new, const CBlockIndex*
     if (index_new != chainActive.Tip())
         return;
     // Create new block template for miners
-    _ctr->_last_sync_time = GetTime();
-    _ctr->_last_txn_time = mempool.GetTransactionsUpdated();
     _ctr->_ctx->shared->RecreateBlock();
     // start miners
     if (_ctr->can_start()) {
@@ -95,13 +95,7 @@ void MinerSignals::NotifyTransaction(const CTransaction& txn, const CBlockIndex*
     // check if blockchain has synced, has more than 1 peer and is enabled before recreating blocks
     if (IsInitialBlockDownload() || !_ctr->can_start())
         return;
-
-    const int64_t latest_txn = mempool.GetTransactionsUpdated();
-    if (latest_txn == _ctr->_last_txn_time) {
-        return;
-    }
-    if (GetTime() - _ctr->_last_txn_time > 60) {
-        _ctr->_last_txn_time = latest_txn;
+    if (GetTime() - _ctr->_ctx->shared->last_txn() > 60) {
         _ctr->_ctx->shared->RecreateBlock();
     }
 };
diff --git a/src/miner/internal/miners-controller.h b/src/miner/internal/miners-controller.h
@@ -63,7 +63,7 @@ class MinersController
     void StartIfEnabled();
 
     // Returns true if enabled, connected and has block.
-    bool can_start() const { return _connected && _enable_start && _ctx->shared->has_block(); }
+    bool can_start() const { return _connected && _enable_start && _ctx->shared->block_template(); }
 
     // Miner signals class
     friend class MinerSignals;
