refactor: introduce CbTx version enum class, adjust version names

dashpay · Nov 21, 2023 · b137954 · b137954
1 parent 9861bc7
commit b137954
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
@@ -33,7 +33,7 @@ bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, TxValidati
         return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-cbtx-payload");
     }
 
-    if (cbTx.nVersion == 0 || cbTx.nVersion > CCbTx::CB_V20_VERSION) {
+    if (cbTx.nVersion == CbTxVersion::INVALID || cbTx.nVersion >= CbTxVersion::UNKNOWN) {
         return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-cbtx-version");
     }
 
@@ -43,12 +43,12 @@ bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, TxValidati
         }
 
         bool fDIP0008Active = pindexPrev->nHeight >= Params().GetConsensus().DIP0008Height;
-        if (fDIP0008Active && cbTx.nVersion < CCbTx::CB_V19_VERSION) {
+        if (fDIP0008Active && cbTx.nVersion < CbTxVersion::MERKLE_ROOT_QUORUMS) {
             return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-cbtx-version");
         }
 
         bool isV20 = llmq::utils::IsV20Active(pindexPrev);
-        if ((isV20 && cbTx.nVersion < CCbTx::CB_V20_VERSION) || (!isV20 && cbTx.nVersion >= CCbTx::CB_V20_VERSION)) {
+        if ((isV20 && cbTx.nVersion < CbTxVersion::BEST_CHAINLOCK) || (!isV20 && cbTx.nVersion >= CbTxVersion::BEST_CHAINLOCK)) {
             return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-cbtx-version");
         }
     }
@@ -91,7 +91,7 @@ bool CheckCbTxMerkleRoots(const CBlock& block, const CBlockIndex* pindex, const
         int64_t nTime3 = GetTimeMicros(); nTimeMerkleMNL += nTime3 - nTime2;
         LogPrint(BCLog::BENCHMARK, "          - CalcCbTxMerkleRootMNList: %.2fms [%.2fs]\n", 0.001 * (nTime3 - nTime2), nTimeMerkleMNL * 0.000001);
 
-        if (cbTx.nVersion >= 2) {
+        if (cbTx.nVersion >= CbTxVersion::MERKLE_ROOT_QUORUMS) {
             if (!CalcCbTxMerkleRootQuorums(block, pindex->pprev, quorum_block_processor, calculatedMerkleRoot, state)) {
                 // pass the state returned by the function above
                 return false;
@@ -332,7 +332,7 @@ bool CheckCbTxBestChainlock(const CBlock& block, const CBlockIndex* pindex, cons
         return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-cbtx-payload");
     }
 
-    if (cbTx.nVersion < CCbTx::CB_V20_VERSION) {
+    if (cbTx.nVersion < CbTxVersion::BEST_CHAINLOCK) {
         return true;
     }
 
@@ -433,7 +433,7 @@ bool CalcCbTxBestChainlock(const llmq::CChainLocksHandler& chainlock_handler, co
 std::string CCbTx::ToString() const
 {
     return strprintf("CCbTx(nVersion=%d, nHeight=%d, merkleRootMNList=%s, merkleRootQuorums=%s, bestCLHeightDiff=%d, bestCLSig=%s, creditPoolBalance=%d.%08d)",
-        nVersion, nHeight, merkleRootMNList.ToString(), merkleRootQuorums.ToString(), bestCLHeightDiff, bestCLSignature.ToString(),
+        static_cast<uint16_t>(nVersion), nHeight, merkleRootMNList.ToString(), merkleRootQuorums.ToString(), bestCLHeightDiff, bestCLSignature.ToString(),
         creditPoolBalance / COIN, creditPoolBalance % COIN);
 }
 
@@ -467,7 +467,7 @@ std::optional<std::pair<CBLSSignature, uint32_t>> GetNonNullCoinbaseChainlock(co
 
     CCbTx& cbtx = opt_cbtx.value();
 
-    if (cbtx.nVersion < CCbTx::CB_V20_VERSION) {
+    if (cbtx.nVersion < CbTxVersion::BEST_CHAINLOCK) {
         return std::nullopt;
     }
 

diff --git a/src/evo/cbtx.h b/src/evo/cbtx.h
@@ -25,15 +25,21 @@ class CChainLocksHandler;
 // Forward declaration from core_io to get rid of circular dependency
 UniValue ValueFromAmount(const CAmount& amount);
 
+enum class CbTxVersion : uint16_t {
+    INVALID = 0,
+    MERKLE_ROOT_MNLIST = 1,
+    MERKLE_ROOT_QUORUMS = 2,
+    BEST_CHAINLOCK = 3,
+    UNKNOWN,
+};
+template<> struct is_serializable_enum<CbTxVersion> : std::true_type {};
+
 // coinbase transaction
 class CCbTx
 {
 public:
     static constexpr auto SPECIALTX_TYPE = TRANSACTION_COINBASE;
-    static constexpr uint16_t CB_V19_VERSION = 2;
-    static constexpr uint16_t CB_V20_VERSION = 3;
-
-    uint16_t nVersion{CB_V19_VERSION};
+    CbTxVersion nVersion{CbTxVersion::MERKLE_ROOT_QUORUMS};
     int32_t nHeight{0};
     uint256 merkleRootMNList;
     uint256 merkleRootQuorums;
@@ -45,9 +51,9 @@ class CCbTx
     {
         READWRITE(obj.nVersion, obj.nHeight, obj.merkleRootMNList);
 
-        if (obj.nVersion >= CB_V19_VERSION) {
+        if (obj.nVersion >= CbTxVersion::MERKLE_ROOT_QUORUMS) {
             READWRITE(obj.merkleRootQuorums);
-            if (obj.nVersion >= CB_V20_VERSION) {
+            if (obj.nVersion >= CbTxVersion::BEST_CHAINLOCK) {
                 READWRITE(COMPACTSIZE(obj.bestCLHeightDiff));
                 READWRITE(obj.bestCLSignature);
                 READWRITE(obj.creditPoolBalance);
@@ -65,9 +71,9 @@ class CCbTx
         obj.pushKV("version", (int)nVersion);
         obj.pushKV("height", nHeight);
         obj.pushKV("merkleRootMNList", merkleRootMNList.ToString());
-        if (nVersion >= CB_V19_VERSION) {
+        if (nVersion >= CbTxVersion::MERKLE_ROOT_QUORUMS) {
             obj.pushKV("merkleRootQuorums", merkleRootQuorums.ToString());
-            if (nVersion >= CB_V20_VERSION) {
+            if (nVersion >= CbTxVersion::BEST_CHAINLOCK) {
                 obj.pushKV("bestCLHeightDiff", static_cast<int>(bestCLHeightDiff));
                 obj.pushKV("bestCLSignature", bestCLSignature.ToString());
                 obj.pushKV("creditPoolBalance", ValueFromAmount(creditPoolBalance));

diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
@@ -269,7 +269,7 @@ UniValue CSimplifiedMNListDiff::ToJson(bool extended) const
     CCbTx cbTxPayload;
     if (GetTxPayload(*cbTx, cbTxPayload)) {
         obj.pushKV("merkleRootMNList", cbTxPayload.merkleRootMNList.ToString());
-        if (cbTxPayload.nVersion >= 2) {
+        if (cbTxPayload.nVersion >= CbTxVersion::MERKLE_ROOT_QUORUMS) {
             obj.pushKV("merkleRootQuorums", cbTxPayload.merkleRootQuorums.ToString());
         }
     }

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -202,11 +202,11 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
         CCbTx cbTx;
 
         if (fV20Active_context) {
-            cbTx.nVersion = CCbTx::CB_V20_VERSION;
+            cbTx.nVersion = CbTxVersion::BEST_CHAINLOCK;
         } else if (fDIP0008Active_context) {
-            cbTx.nVersion = CCbTx::CB_V19_VERSION;
+            cbTx.nVersion = CbTxVersion::MERKLE_ROOT_QUORUMS;
         } else {
-            cbTx.nVersion = 1;
+            cbTx.nVersion = CbTxVersion::MERKLE_ROOT_MNLIST;
         }
 
         cbTx.nHeight = nHeight;