Restore pool mining

src/cryptonote_basic/cryptonote_basic.h

@@ -470,7 +470,7 @@ namespace cryptonote
       VARINT_FIELD(timestamp)
       FIELD(prev_id)
       FIELD(nonce)
-      if (major_version >= BLOCK_HEADER_MINER_SIG)
+      if (major_version >= BLOCK_HEADER_MINER_SIG && major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
       {
           FIELD(signature)
           FIELD(vote)

src/cryptonote_basic/cryptonote_boost_serialization.h

@@ -196,7 +196,7 @@ namespace boost
     a & b.timestamp;
     a & b.prev_id;
     a & b.nonce;
-    if (b.major_version >= BLOCK_HEADER_MINER_SIG)
+    if (b.major_version >= BLOCK_HEADER_MINER_SIG && b.major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
     {
       a & b.signature;
       a & b.vote;

src/cryptonote_basic/miner.cpp

@@ -609,7 +609,7 @@ namespace cryptonote
       b.nonce = nonce;
 
       // Miner Block Header Signing
-      if (b.major_version >= BLOCK_HEADER_MINER_SIG)
+      if (b.major_version >= BLOCK_HEADER_MINER_SIG && b.major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
       {
         // tx key derivation
         crypto::key_derivation derivation;

src/cryptonote_config.h

@@ -46,6 +46,7 @@
 #define CURRENT_BLOCK_MAJOR_VERSION                     7
 #define CURRENT_BLOCK_MINOR_VERSION                     7
 #define BLOCK_HEADER_MINER_SIG                          18
+#define REMOVED_BLOCK_HEADER_MINER_SIG                  20
 #define CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT_V2           300*2
 #define CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT              60*60*2
 #define CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE             4

src/cryptonote_core/blockchain.cpp

@@ -1392,7 +1392,7 @@ difficulty_type Blockchain::get_next_difficulty_for_alternative_chain(const std:
 bool Blockchain::prevalidate_miner_transaction(const block& b, uint64_t height, uint8_t hf_version)
 {
   // Miner Block Header Signing
-  if (hf_version >= BLOCK_HEADER_MINER_SIG)
+  if (hf_version >= BLOCK_HEADER_MINER_SIG && hf_version < REMOVED_BLOCK_HEADER_MINER_SIG)
   {
       // sanity checks
       if (b.miner_tx.vout.size() != 1)

src/rpc/core_rpc_server.cpp

@@ -2192,7 +2192,7 @@ namespace cryptonote
         return false;
       }
       b.nonce = req.starting_nonce;
-      if (b.major_version >= BLOCK_HEADER_MINER_SIG)
+      if (b.major_version >= BLOCK_HEADER_MINER_SIG && b.major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
       {
           b.signature = {};
           b.vote = 0;

src/rpc/daemon_handler.cpp

@@ -895,7 +895,7 @@ namespace rpc
     header.minor_version = b.minor_version;
     header.timestamp = b.timestamp;
     header.nonce = b.nonce;
-    if (b.major_version >= BLOCK_HEADER_MINER_SIG)
+    if (b.major_version >= BLOCK_HEADER_MINER_SIG && b.major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
     {
       header.signature = b.signature;
       header.vote = b.vote;