Merge pull request qtumproject#24 from qtumproject/minsk-team/FIX-iss…

…ue#23 Fixed (invalidateblock fails).
changshoumeng · Apr 4, 2017 · ea51c46 · ea51c46
2 parents 4a93e69 + 8f16a62
commit ea51c46
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/undo.h b/src/undo.h
@@ -30,19 +30,29 @@ class CTxInUndo
 
     template<typename Stream>
     void Serialize(Stream &s) const {
-        ::Serialize(s, VARINT(nHeight*2+(fCoinBase ? 1 : 0)));
+/////////////////////////////////////////////////////////// // qtum
+        // ::Serialize(s, VARINT(nHeight*2+(fCoinBase ? 1 : 0)));
+        ::Serialize(s, VARINT(nHeight));
+        ::Serialize(s, fCoinBase);
+        ::Serialize(s, fCoinStake);
+///////////////////////////////////////////////////////////
         if (nHeight > 0)
             ::Serialize(s, VARINT(this->nVersion));
         ::Serialize(s, CTxOutCompressor(REF(txout)));
     }
 
     template<typename Stream>
     void Unserialize(Stream &s) {
-        unsigned int nCode = 0;
-        ::Unserialize(s, VARINT(nCode));
-        nHeight = nCode / 4;
-        fCoinBase = nCode & 1;
-        fCoinStake = nCode & 2;
+/////////////////////////////////////////////////////////// // qtum
+        // unsigned int nCode = 0;
+        // ::Unserialize(s, VARINT(nCode));
+        // nHeight = nCode / 4;
+        // fCoinBase = nCode & 1;
+        // fCoinStake = nCode & 2;
+        ::Unserialize(s, VARINT(nHeight));
+        ::Unserialize(s, fCoinBase);
+        ::Unserialize(s, fCoinStake);
+///////////////////////////////////////////////////////////
         if (nHeight > 0)
             ::Unserialize(s, VARINT(this->nVersion));
         ::Unserialize(s, REF(CTxOutCompressor(REF(txout))));