mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
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
This commit is contained in:
parent
4b4001bbe7
commit
1d96fbf091
@ -55,13 +55,9 @@ static bool CheckSpecialTxInner(CDeterministicMNManager& dmnman, const Chainstat
|
|||||||
case TRANSACTION_ASSET_LOCK:
|
case TRANSACTION_ASSET_LOCK:
|
||||||
return CheckAssetLockUnlockTx(chainman.m_blockman, qman, tx, pindexPrev, indexes, state);
|
return CheckAssetLockUnlockTx(chainman.m_blockman, qman, tx, pindexPrev, indexes, state);
|
||||||
case TRANSACTION_ASSET_UNLOCK:
|
case TRANSACTION_ASSET_UNLOCK:
|
||||||
if (Params().NetworkIDString() == CBaseChainParams::REGTEST && !DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_V20)) {
|
if (!DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_V20)) {
|
||||||
// TODO: adjust functional tests to make it activated by MN_RR on regtest too
|
|
||||||
return state.Invalid(TxValidationResult::TX_CONSENSUS, "assetunlocks-before-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);
|
return CheckAssetLockUnlockTx(chainman.m_blockman, qman, tx, pindexPrev, indexes, state);
|
||||||
}
|
}
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
|
Loading…
Reference in New Issue
Block a user