feat: forbid temporary Asset Locks txes everywhere except RegTest

dashpay · Sep 4, 2023 · 6920961 · 6920961
1 parent 13db37a
commit 6920961
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
@@ -51,6 +51,9 @@ static bool CheckSpecialTxInner(const CTransaction& tx, const CBlockIndex* pinde
             return CheckMNHFTx(tx, pindexPrev, state);
         case TRANSACTION_ASSET_LOCK:
         case TRANSACTION_ASSET_UNLOCK:
+            if (Params().NetworkIDString() != CBaseChainParams::REGTEST) {
+                return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-assetlock-regtest-only");
+            }
             if (!llmq::utils::IsV20Active(pindexPrev)) {
                 return state.Invalid(TxValidationResult::TX_CONSENSUS, "assetlocks-before-v20");
             }

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -392,6 +392,11 @@ static bool ContextualCheckTransaction(const CTransaction& tx, TxValidationState
                 tx.nType != TRANSACTION_ASSET_UNLOCK) {
                 return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-type");
             }
+            if (Params().NetworkIDString() != CBaseChainParams::REGTEST &&
+                    (tx.nType == TRANSACTION_ASSET_LOCK || tx.nType == TRANSACTION_ASSET_UNLOCK)) {
+                return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-assetlock-regtest-only");
+            }
+
             if (tx.IsCoinBase() && tx.nType != TRANSACTION_COINBASE)
                 return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-cb-type");
         } else if (tx.nType != TRANSACTION_NORMAL) {