coins,refactor: Unify Coin Serialization styles

l0rinc · l0rinc · commit 61cde55c5695 · 2025-07-28T14:11:38.000-07:00
diff --git a/src/coins.h b/src/coins.h
@@ -26,7 +26,7 @@
  * A UTXO entry.
  *
  * Serialized format:
- * - VARINT((coinbase ? 1 : 0) | (height << 1))
+ * - VARINT((height << 1) | (coinbase ? 1 : 0))
  * - the non-spent CTxOut (via TxOutCompression)
  */
 class Coin
@@ -61,7 +61,7 @@ class Coin
     template<typename Stream>
     void Serialize(Stream &s) const {
         assert(!IsSpent());
-        uint32_t code = nHeight * uint32_t{2} + fCoinBase;
+        uint32_t code{static_cast<uint32_t>(nHeight << 1) | fCoinBase};
         ::Serialize(s, VARINT(code));
         ::Serialize(s, Using<TxOutCompression>(out));
     }
diff --git a/src/kernel/coinstats.cpp b/src/kernel/coinstats.cpp
@@ -51,7 +51,7 @@ template <typename T>
 static void TxOutSer(T& ss, const COutPoint& outpoint, const Coin& coin)
 {
     ss << outpoint;
-    ss << static_cast<uint32_t>((coin.nHeight << 1) + coin.fCoinBase);
+    ss << (static_cast<uint32_t>(coin.nHeight << 1) | coin.fCoinBase);
     ss << coin.out;
 }
 
diff --git a/src/undo.h b/src/undo.h
@@ -23,7 +23,8 @@ struct TxInUndoFormatter
 {
     template<typename Stream>
     void Ser(Stream &s, const Coin& txout) {
-        ::Serialize(s, VARINT(txout.nHeight * uint32_t{2} + txout.fCoinBase ));
+        uint32_t nCode{static_cast<uint32_t>(txout.nHeight << 1) | txout.fCoinBase};
+        ::Serialize(s, VARINT(nCode));
         if (txout.nHeight > 0) {
             // Required to maintain compatibility with older undo format.
             ::Serialize(s, (unsigned char)0);

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ template <typename T>`
`51`	`51`	`static void TxOutSer(T& ss, const COutPoint& outpoint, const Coin& coin)`
`52`	`52`	`{`
`53`	`53`	`ss << outpoint;`
`54`		`- ss << static_cast<uint32_t>((coin.nHeight << 1) + coin.fCoinBase);`
	`54`	`+ ss << (static_cast<uint32_t>(coin.nHeight << 1) \| coin.fCoinBase);`
`55`	`55`	`ss << coin.out;`
`56`	`56`	`}`
`57`	`57`