Merge pull request #1478 from evoskuil/master

Add block/header.get_hash() to avoid hash copy when cached.

include/bitcoin/system/chain/block.hpp

@@ -99,6 +99,9 @@ class BC_API block
     size_t serialized_size(bool witness) const NOEXCEPT;
     size_t signature_operations(bool bip16, bool bip141) const NOEXCEPT;
 
+    /// Reference used to avoid copy, sets cache if not set (not thread safe).
+    const hash_digest& get_hash() const NOEXCEPT;
+
     /// Computed malleation properties.
     bool is_malleable() const NOEXCEPT;
     bool is_malleable64() const NOEXCEPT;

include/bitcoin/system/chain/header.hpp

@@ -105,6 +105,9 @@ class BC_API header
     /// Cache (this overrides hash() computation).
     void set_hash(hash_digest&& hash) const NOEXCEPT;
 
+    /// Reference used to avoid copy, sets cache if not set (not thread safe).
+    const hash_digest& get_hash() const NOEXCEPT;
+
     /// Validation.
     /// -----------------------------------------------------------------------
     /// Checkpoints and previous_block_hash are chain validation (not here).

include/bitcoin/system/chain/transaction.hpp

@@ -119,7 +119,7 @@ class BC_API transaction
     /// This need not be set if the transaction is not segmented.
     void set_witness_hash(hash_digest&& hash) const NOEXCEPT;
 
-    /// Reference used to avoid copy, sets cache if not set.
+    /// Reference used to avoid copy, sets cache if not set (not thread safe).
     const hash_digest& get_hash(bool witness) const NOEXCEPT;
 
     /// Methods.

src/chain/block.cpp

@@ -254,6 +254,12 @@ hash_digest block::hash() const NOEXCEPT
     return header_->hash();
 }
 
+// computed
+const hash_digest& block::get_hash() const NOEXCEPT
+{
+    return header_->get_hash();
+}
+
 // static/private
 block::sizes block::serialized_size(
     const chain::transaction_cptrs& txs) NOEXCEPT

src/chain/header.cpp

@@ -251,6 +251,14 @@ hash_digest header::hash() const NOEXCEPT
     return digest;
 }
 
+const hash_digest& header::get_hash() const NOEXCEPT
+{
+    if (!hash_)
+        set_hash(hash());
+
+    return *hash_;
+}
+
 // static
 uint256_t header::proof(uint32_t bits) NOEXCEPT
 {