Merge pull request #5557 from ethereum/improve-sync-log

Output request destination node address in sync log messages

CHANGELOG.md

@@ -3,9 +3,9 @@
 ## [1.7.0] - Unreleased
 
 - Added: [#5537](https://github.com/ethereum/aleth/pull/5537) Creating Ethereum Node Record (ENR) at program start.
+- Added: [#5557](https://github.com/ethereum/aleth/pull/5557) Improved debug logging of full sync.
 - Changed: [#5559](https://github.com/ethereum/aleth/pull/5559) Update peer validation error messages.
 
-
 ## [1.6.0] - Unreleased
 
 - Added: [#5485](https://github.com/ethereum/aleth/pull/5485) aleth-bootnode now by default connects to official Ethereum bootnodes. This can be disabled with `--no-bootstrap` flag.

libethereum/EthereumPeer.cpp

@@ -95,7 +95,7 @@ void EthereumPeer::requestBlockHeaders(
     m_host->prep(m_id, c_ethCapability, s, GetBlockHeadersPacket, 4)
         << _startNumber << _count << _skip << (_reverse ? 1 : 0);
     LOG(m_logger) << "Requesting " << _count << " block headers starting from " << _startNumber
-                  << (_reverse ? " in reverse" : "");
+                  << (_reverse ? " in reverse" : "") << " from " << m_id;
     m_lastAskedHeaders = _count;
     m_host->sealAndSend(m_id, s);
 }
@@ -112,7 +112,7 @@ void EthereumPeer::requestBlockHeaders(
     m_host->prep(m_id, c_ethCapability, s, GetBlockHeadersPacket, 4)
         << _startHash << _count << _skip << (_reverse ? 1 : 0);
     LOG(m_logger) << "Requesting " << _count << " block headers starting from " << _startHash
-                  << (_reverse ? " in reverse" : "");
+                  << (_reverse ? " in reverse" : "") << " from " << m_id;
     m_lastAskedHeaders = _count;
     m_host->sealAndSend(m_id, s);
 }
@@ -148,6 +148,8 @@ void EthereumPeer::requestByHashes(
         m_host->prep(m_id, c_ethCapability, s, _packetType, _hashes.size());
         for (auto const& i : _hashes)
             s << i;
+        LOG(m_logger) << "Requesting " << _hashes.size() << " " << ::toString(_asking) << " from "
+                      << m_id;
         m_host->sealAndSend(m_id, s);
     }
     else