evo: prohibit extended address versioning on unsupported transactions

kwvg · kwvg · commit abf96b569e57 · 2025-07-09T17:51:43.000Z
This is a more explicit check that builds on the implicit maximum
version check.
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
@@ -1295,13 +1295,14 @@ static std::optional<ProTx> GetValidatedPayload(const CTransaction& tx, gsl::not
 /**
  * Validates potential changes to masternode state version by ProTx transaction version
  * @param[in]  pindexPrev    Previous block index to validate DEPLOYMENT_V23 activation
+ * @param[in]  tx_type       Special transaction type
  * @param[in]  state_version Current masternode state version
  * @param[in]  tx_version    Proposed transaction version
  * @param[out] state         This may be set to an Error state if any error occurred processing them
  * @returns                  true if version change is valid or DEPLOYMENT_V23 is not active
  */
-bool IsVersionChangeValid(gsl::not_null<const CBlockIndex*> pindexPrev, const uint16_t state_version, const uint16_t tx_version,
-                          TxValidationState& state)
+bool IsVersionChangeValid(gsl::not_null<const CBlockIndex*> pindexPrev, const uint16_t tx_type,
+                          const uint16_t state_version, const uint16_t tx_version, TxValidationState& state)
 {
     if (!DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V23)) {
         // New restrictions only apply after v23 deployment
@@ -1318,6 +1319,11 @@ bool IsVersionChangeValid(gsl::not_null<const CBlockIndex*> pindexPrev, const ui
         return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version-upgrade");
     }
 
+    if (tx_type != TRANSACTION_PROVIDER_UPDATE_SERVICE && tx_version == ProTxVersion::ExtAddr) {
+        // Only new entries (ProRegTx) and service updates (ProUpServTx) can use ExtAddr versioning
+        return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version-tx-type");
+    }
+
     return true;
 }
 
@@ -1468,7 +1474,7 @@ bool CheckProUpServTx(CDeterministicMNManager& dmnman, const CTransaction& tx, g
         return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-hash");
     }
 
-    if (!IsVersionChangeValid(pindexPrev, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {
+    if (!IsVersionChangeValid(pindexPrev, tx.nType, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {
         // pass the state returned by the function above
         return false;
     }
@@ -1535,7 +1541,7 @@ bool CheckProUpRegTx(CDeterministicMNManager& dmnman, const CTransaction& tx, gs
         return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-hash");
     }
 
-    if (!IsVersionChangeValid(pindexPrev, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {
+    if (!IsVersionChangeValid(pindexPrev, tx.nType, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {
         // pass the state returned by the function above
         return false;
     }
@@ -1599,7 +1605,7 @@ bool CheckProUpRevTx(CDeterministicMNManager& dmnman, const CTransaction& tx, gs
         return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-hash");
     }
 
-    if (!IsVersionChangeValid(pindexPrev, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {
+    if (!IsVersionChangeValid(pindexPrev, tx.nType, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {
         // pass the state returned by the function above
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -1295,13 +1295,14 @@ static std::optional<ProTx> GetValidatedPayload(const CTransaction& tx, gsl::not`
`1295`	`1295`	`/**`
`1296`	`1296`	`* Validates potential changes to masternode state version by ProTx transaction version`
`1297`	`1297`	`* @param[in] pindexPrev Previous block index to validate DEPLOYMENT_V23 activation`
	`1298`	`+ * @param[in] tx_type Special transaction type`
`1298`	`1299`	`* @param[in] state_version Current masternode state version`
`1299`	`1300`	`* @param[in] tx_version Proposed transaction version`
`1300`	`1301`	`* @param[out] state This may be set to an Error state if any error occurred processing them`
`1301`	`1302`	`* @returns true if version change is valid or DEPLOYMENT_V23 is not active`
`1302`	`1303`	`*/`
`1303`		`-bool IsVersionChangeValid(gsl::not_null<const CBlockIndex*> pindexPrev, const uint16_t state_version, const uint16_t tx_version,`
`1304`		`- TxValidationState& state)`
	`1304`	`+bool IsVersionChangeValid(gsl::not_null<const CBlockIndex*> pindexPrev, const uint16_t tx_type,`
	`1305`	`+ const uint16_t state_version, const uint16_t tx_version, TxValidationState& state)`
`1305`	`1306`	`{`
`1306`	`1307`	`if (!DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V23)) {`
`1307`	`1308`	`// New restrictions only apply after v23 deployment`
`@@ -1318,6 +1319,11 @@ bool IsVersionChangeValid(gsl::not_null<const CBlockIndex*> pindexPrev, const ui`
`1318`	`1319`	`return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version-upgrade");`
`1319`	`1320`	`}`
`1320`	`1321`
	`1322`	`+ if (tx_type != TRANSACTION_PROVIDER_UPDATE_SERVICE && tx_version == ProTxVersion::ExtAddr) {`
	`1323`	`+ // Only new entries (ProRegTx) and service updates (ProUpServTx) can use ExtAddr versioning`
	`1324`	`+ return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version-tx-type");`
	`1325`	`+ }`
	`1326`	`+`
`1321`	`1327`	`return true;`
`1322`	`1328`	`}`
`1323`	`1329`
`@@ -1468,7 +1474,7 @@ bool CheckProUpServTx(CDeterministicMNManager& dmnman, const CTransaction& tx, g`
`1468`	`1474`	`return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-hash");`
`1469`	`1475`	`}`
`1470`	`1476`
`1471`		`- if (!IsVersionChangeValid(pindexPrev, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {`
	`1477`	`+ if (!IsVersionChangeValid(pindexPrev, tx.nType, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {`
`1472`	`1478`	`// pass the state returned by the function above`
`1473`	`1479`	`return false;`
`1474`	`1480`	`}`
`@@ -1535,7 +1541,7 @@ bool CheckProUpRegTx(CDeterministicMNManager& dmnman, const CTransaction& tx, gs`
`1535`	`1541`	`return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-hash");`
`1536`	`1542`	`}`
`1537`	`1543`
`1538`		`- if (!IsVersionChangeValid(pindexPrev, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {`
	`1544`	`+ if (!IsVersionChangeValid(pindexPrev, tx.nType, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {`
`1539`	`1545`	`// pass the state returned by the function above`
`1540`	`1546`	`return false;`
`1541`	`1547`	`}`
`@@ -1599,7 +1605,7 @@ bool CheckProUpRevTx(CDeterministicMNManager& dmnman, const CTransaction& tx, gs`
`1599`	`1605`	`return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-hash");`
`1600`	`1606`	`}`
`1601`	`1607`
`1602`		`- if (!IsVersionChangeValid(pindexPrev, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {`
	`1608`	`+ if (!IsVersionChangeValid(pindexPrev, tx.nType, dmn->pdmnState->nVersion, opt_ptx->nVersion, state)) {`
`1603`	`1609`	`// pass the state returned by the function above`
`1604`	`1610`	`return false;`
`1605`	`1611`	`}`