From 1d96fbf091ee9906cf8bd46fde22c40bc160e8b2 Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Mon, 26 Aug 2024 13:07:24 +0700 Subject: [PATCH] feat: let asset-unlock transactions be available since v20 on all networks It simplify implementation and unify RegTest, Mainnet and Testnet No asset-unlock transaction has actually be mined yet, but v20 and mn_rr are activated long time ago. So, this changes are not breaking changes --- src/evo/specialtxman.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp index 2e60d88c9a..e4e042da33 100644 --- a/src/evo/specialtxman.cpp +++ b/src/evo/specialtxman.cpp @@ -55,13 +55,9 @@ static bool CheckSpecialTxInner(CDeterministicMNManager& dmnman, const Chainstat case TRANSACTION_ASSET_LOCK: return CheckAssetLockUnlockTx(chainman.m_blockman, qman, tx, pindexPrev, indexes, state); case TRANSACTION_ASSET_UNLOCK: - if (Params().NetworkIDString() == CBaseChainParams::REGTEST && !DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_V20)) { - // TODO: adjust functional tests to make it activated by MN_RR on regtest too + if (!DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_V20)) { return state.Invalid(TxValidationResult::TX_CONSENSUS, "assetunlocks-before-v20"); } - if (Params().NetworkIDString() != CBaseChainParams::REGTEST && !DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_MN_RR)) { - return state.Invalid(TxValidationResult::TX_CONSENSUS, "assetunlocks-before-mn_rr"); - } return CheckAssetLockUnlockTx(chainman.m_blockman, qman, tx, pindexPrev, indexes, state); } } catch (const std::exception& e) {