Merge pull request #468 from evoskuil/master

Define and use max_locator, add get_headers.start_hash(), style, comments.

Author: evoskuil

include/bitcoin/network/error.hpp

@@ -75,6 +75,7 @@ enum error_t : uint8_t
     peer_disconnect,
     peer_unsupported,
     peer_insufficient,
+    peer_timestamp,
     protocol_violation,
     channel_overflow,
     channel_underflow,

include/bitcoin/network/messages/enums/level.hpp

@@ -28,11 +28,20 @@ namespace messages {
 // Minimum current libbitcoin protocol version: 31402
 // Minimum current satoshi    protocol version: 31800
 
+// * sendaddrv2 is unverioned in BIP155 but requires version 70016 in Sataoshi:
+// "BIP155 defines addrv2 and sendaddrv2 for all protocol versions, but some
+// implementations reject messages they don't know. As a courtesy, don't send
+// it to nodes with a version before 70016, as no software is known to support
+// BIP155 that doesn't announce at least that protocol version number."
+// ** TODO: these should be based solely on NODE_COMPACT_FILTERS signal, but we
+// may associate protocol version at which it was deployed.
+
 // libbitcoin-network
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // version      v1
 // verack       v1
 // getaddr      v1
+// sendaddrv2   v4      70016   BIP155  expanded address types (*)
 // addr         v1
 // ping         v1
 // ping         v2      60001   BIP031  added nonce field
@@ -72,17 +81,12 @@ namespace messages {
 // cmpctblock   v4      70014   BIP152
 // getblocktxn  v4      70014   BIP152
 // sendcmpct    v4      70014   BIP152
-
-// TODO: these should be based solely on NODE_COMPACT_FILTERS signal.
-// TODO: but we may associate protocol version at which it was deployed.
-// cfilter      v4      70015   BIP157  not BIP-associated to p2p version
-// getcfilters  v4      70015   BIP157  not BIP-associated to p2p version
-// cfcheckpt    v4      70015   BIP157  not BIP-associated to p2p version
-// getcfcheckpt v4      70015   BIP157  not BIP-associated to p2p version
-// cfheaders    v4      70015   BIP157  not BIP-associated to p2p version
-// getcfheaders v4      70015   BIP157  not BIP-associated to p2p version
-
-// sendaddrv2   --      00000   BIP155  compat break, unversioned, handshake
+// cfilter      v4      70015   BIP157  not BIP-associated to p2p version (**)
+// getcfilters  v4      70015   BIP157  not BIP-associated to p2p version (**)
+// cfcheckpt    v4      70015   BIP157  not BIP-associated to p2p version (**)
+// getcfcheckpt v4      70015   BIP157  not BIP-associated to p2p version (**)
+// cfheaders    v4      70015   BIP157  not BIP-associated to p2p version (**)
+// getcfheaders v4      70015   BIP157  not BIP-associated to p2p version (**)
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 enum level: uint32_t

include/bitcoin/network/messages/enums/magic_numbers.hpp

@@ -44,6 +44,9 @@ constexpr size_t max_reject_message = max_uint16;
 // This is arbitrary, useful as an address pool and block announce guard.
 constexpr size_t maximum_advertisement = 10;
 
+/// Limit given 10 and max supported height chain (stop hash excluded).
+constexpr size_t max_locator = 10_size + system::floored_log2(max_size_t);
+
 ////constexpr size_t max_bloom_filter_hashes = 2'000;
 ////constexpr size_t max_get_data = 50'000;
 ////constexpr size_t max_get_client_filter_headers = 1'999;
@@ -52,8 +55,6 @@ constexpr size_t maximum_advertisement = 10;
 /////// compact filter checkpoint interval
 ////constexpr size_t client_filter_checkpoint_interval = 1000;
 
-/////// Effective limit given a 32 bit chain height boundary: 10 + log2(2^32) + 1.
-////constexpr size_t max_locator = 43;
 
 } // namespace messages
 } // namespace network

include/bitcoin/network/messages/get_headers.hpp

@@ -54,6 +54,9 @@ struct BCT_API get_headers
 
     size_t size(uint32_t version) const NOEXCEPT;
 
+    /// First start hash or null_hash if none.
+    const system::hash_digest& start_hash() const NOEXCEPT;
+
     ////uint32_t protocol_version;
     system::hashes start_hashes{};
     system::hash_digest stop_hash{};

include/bitcoin/network/protocols/protocol_version_31402.hpp

@@ -78,6 +78,8 @@ class BCT_API protocol_version_31402
     const uint64_t invalid_services_;
 
 private:
+    static bool is_disallowed_deviation(uint64_t timestamp) NOEXCEPT;
+
     // These are protected by strand.
     bool sent_version_{};
     bool received_version_{};

src/error.cpp

@@ -51,6 +51,7 @@ DEFINE_ERROR_T_MESSAGE_MAP(error)
     { peer_disconnect, "peer disconnect" },
     { peer_unsupported, "peer unsupported" },
     { peer_insufficient, "peer insufficient" },
+    { peer_timestamp, "peer timestamp" },
     { protocol_violation, "protocol violation" },
     { channel_overflow, "channel overflow" },
     { channel_underflow, "channel underflow" },

src/messages/compact_transactions.cpp

@@ -60,8 +60,8 @@ compact_transactions compact_transactions::deserialize(uint32_t version,
         transaction_ptrs.reserve(size);
 
         for (size_t tx = 0; tx < size; ++tx)
-            transaction_ptrs.emplace_back(
-                std::make_shared<const chain::transaction>(source, witness));
+            transaction_ptrs.push_back(
+                to_shared<chain::transaction>(source, witness));
 
         return transaction_ptrs;
     };

src/messages/get_blocks.cpp

@@ -90,7 +90,7 @@ get_blocks get_blocks::deserialize(uint32_t version, reader& source) NOEXCEPT
     const auto read_start_hashes = [](reader& source) NOEXCEPT
     {
         // Count of hashes is redundant with the message size.
-        const auto count = source.read_size(max_get_blocks);
+        const auto count = source.read_size(max_locator);
 
         hashes start_hashes;
         start_hashes.reserve(count);

src/messages/get_headers.cpp

@@ -67,8 +67,8 @@ get_headers get_headers::deserialize(uint32_t version, reader& source) NOEXCEPT
     // Protocol version is stoopid (and unused).
     source.skip_bytes(sizeof(uint32_t));
 
-    // Count of hashes is redundant with the message size.
-    const auto count = source.read_size(max_get_headers);
+    // Count of hashes is unnecessary given message size, also stoopid.
+    const auto count = source.read_size(max_locator);
 
     get_headers get;
     get.start_hashes.reserve(count);
@@ -101,7 +101,7 @@ void get_headers::serialize(uint32_t version, writer& sink) const NOEXCEPT
     // Count of hashes is redundant with the message size.
     sink.write_variable(start_hashes.size());
 
-    for (const auto& start_hash : start_hashes)
+    for (const auto& start_hash: start_hashes)
         sink.write_bytes(start_hash);
 
     sink.write_bytes(stop_hash);
@@ -117,6 +117,12 @@ size_t get_headers::size(uint32_t) const NOEXCEPT
             (hash_size * start_hashes.size());
 }
 
+// Used to simplify logging message identity.
+const hash_digest& get_headers::start_hash() const NOEXCEPT
+{
+    return start_hashes.empty() ? null_hash : start_hashes.front();
+}
+
 } // namespace messages
 } // namespace network
 } // namespace libbitcoin

src/messages/headers.cpp

@@ -75,7 +75,7 @@ headers headers::deserialize(uint32_t version, reader& source) NOEXCEPT
 
     for (size_t header = 0; header < size; ++header)
     {
-        header_ptrs.push_back(std::make_shared<const chain::header>(source));
+        header_ptrs.push_back(to_shared<chain::header>(source));
         if (source.read_byte() != trail)
             source.invalidate();
     }