updating changes to live for block sync issue

Author: sucildossj

src/chain.cpp

@@ -25,8 +25,9 @@ CBlockHeader CBlockIndex::GetBlockHeader(const node::BlockManager& blockman) con
        have to read the actual *header*, not the full block.  */
     if (block.IsAuxpow())
     {
-        blockman.ReadBlockHeader(block, *this);
-        return block;
+        CBlock fullblock;
+        blockman.ReadBlock(fullblock, *this);
+        return fullblock.GetBlockHeader();
     }
 
     if (pprev)

src/net_processing.cpp

@@ -4698,28 +4698,28 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
 
         std::vector<CBlockHeader> headers;
 
-        // // Bypass the normal CBlock deserialization, as we don't want to risk deserializing 2000 full blocks.
-        // unsigned int nCount = ReadCompactSize(vRecv);
-        // if (nCount > m_opts.max_headers_result) {
-        //     Misbehaving(*peer, strprintf("headers message size = %u", nCount));
-        //     return;
-        // }
-        // headers.resize(nCount);
-        // for (unsigned int n = 0; n < nCount; n++) {
-        //     vRecv >> headers[n];
-        //     ReadCompactSize(vRecv); // ignore tx count; assume it is 0.
-        // }
+        // Bypass the normal CBlock deserialization, as we don't want to risk deserializing 2000 full blocks.
+        unsigned int nCount = ReadCompactSize(vRecv);
+        if (nCount > m_opts.max_headers_result) {
+            Misbehaving(*peer, strprintf("headers message size = %u", nCount));
+            return;
+        }
+        headers.resize(nCount);
+        for (unsigned int n = 0; n < nCount; n++) {
+            vRecv >> headers[n];
+            ReadCompactSize(vRecv); // ignore tx count; assume it is 0.
+        }
 
         LogPrintf("testing vRecv >> headers \n");
 
-        vRecv >> headers;
+        // vRecv >> headers;
 
         LogPrintf("testing 123 vRecv >> headers \n");
 
-        for (size_t i = 0; i < headers.size(); i++)
-        {
-             LogPrintf("testing 124 hash >> headers %s \n", headers[i].GetHash().ToString());
-        }
+        // for (size_t i = 0; i < headers.size(); i++)
+        // {
+        //      LogPrintf("testing 124 hash >> headers %s \n", headers[i].GetHash().ToString());
+        // }
 
 
         ProcessHeadersMessage(pfrom, *peer, std::move(headers), /*via_compact_block=*/false);

src/net_processing.h

@@ -45,7 +45,7 @@ static const bool DEFAULT_PEERBLOCKFILTERS = false;
 static const unsigned int MAX_CMPCTBLOCKS_INFLIGHT_PER_BLOCK = 3;
 /** Number of headers sent in one getheaders result. We rely on the assumption that if a peer sends
  *  less than this number, we reached its tip. Changing this value is a protocol upgrade. */
-static const unsigned int MAX_HEADERS_RESULTS = 2000;
+static const unsigned int MAX_HEADERS_RESULTS = 20;
 
 struct CNodeStateStats {
     int nSyncHeight = -1;