Serialize the block header in CBlockHeader::GetHash() (#2531)

* Serialize the block header in CBlockHeader::GetHash() * Switch from CDataStream to CVectorWriter Co-Authored-By: solardiz <solar@openwall.com>
dashpay · Dec 10, 2018 · cbd0303 · cbd0303
1 parent 5185dd5
commit cbd0303
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -397,6 +397,7 @@ libdash_consensus_a_SOURCES = \
   script/script_error.cpp \
   script/script_error.h \
   serialize.h \
+  streams.h \
   tinyformat.h \
   uint256.cpp \
   uint256.h \

diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
@@ -6,13 +6,17 @@
 #include "primitives/block.h"
 
 #include "hash.h"
+#include "streams.h"
 #include "tinyformat.h"
 #include "utilstrencodings.h"
 #include "crypto/common.h"
 
 uint256 CBlockHeader::GetHash() const
 {
-    return HashX11(BEGIN(nVersion), END(nNonce));
+    std::vector<unsigned char> vch(80);
+    CVectorWriter ss(SER_NETWORK, PROTOCOL_VERSION, vch, 0);
+    ss << *this;
+    return HashX11((const char *)vch.data(), (const char *)vch.data() + vch.size());
 }
 
 std::string CBlock::ToString() const