diff --git a/src/chainparams.cpp b/src/chainparams.cpp index a0ffa23236..8716ba49d3 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -195,7 +195,6 @@ public: consensus.DIP0024Height = 1737792; // 0000000000000001342be9c0b75ad40c276beaad91616423c4d9cb101b3db438 consensus.V19Height = 1899072; // 0000000000000015e32e73052d663626327004c81c5c22cb8b42c361015c0eae consensus.MinBIP9WarningHeight = 1899072 + 2016; // V19 activation height + miner confirmation window - consensus.nExpireEHF = 576 * 365; // one year consensus.powLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 20 consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day consensus.nPowTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes @@ -393,7 +392,6 @@ public: consensus.DIP0024Height = 769700; // 0000008d84e4efd890ae95c70a7a6126a70a80e5c19e4cb264a5b3469aeef172 consensus.V19Height = 850100; // 000004728b8ff2a16b9d4eebb0fd61eeffadc9c7fe4b0ec0b5a739869401ab5b consensus.MinBIP9WarningHeight = 850100 + 2016; // v19 activation height + miner confirmation window - consensus.nExpireEHF = 576 * 365; // one year consensus.powLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 20 consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day consensus.nPowTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes @@ -565,7 +563,6 @@ public: consensus.DIP0024Height = 300; consensus.V19Height = 300; consensus.MinBIP9WarningHeight = 300 + 2016; // v19 activation height + miner confirmation window - consensus.nExpireEHF = 576 * 365; // one year consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1 consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day consensus.nPowTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes @@ -804,7 +801,6 @@ public: consensus.DIP0024Height = 900; consensus.V19Height = 900; consensus.MinBIP9WarningHeight = 0; - consensus.nExpireEHF = 576; // one day for RegTest consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1 consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day consensus.nPowTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes diff --git a/src/consensus/params.h b/src/consensus/params.h index 6db88e242b..f06f4352de 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -112,8 +112,6 @@ struct Params { /** Don't warn about unknown BIP 9 activations below this height. * This prevents us from warning about the CSV and DIP activations. */ int MinBIP9WarningHeight; - /** this value is used to expire signals of EHF */ - int nExpireEHF; /** * Minimum blocks including miner confirmation of the total of nMinerConfirmationWindow blocks in a retargeting period, * (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments. diff --git a/src/evo/mnhftx.cpp b/src/evo/mnhftx.cpp index 05d7db3a5b..8e8ecd7683 100644 --- a/src/evo/mnhftx.cpp +++ b/src/evo/mnhftx.cpp @@ -27,12 +27,28 @@ CMNHFManager::Signals CMNHFManager::GetSignalsStage(const CBlockIndex* const pin Signals signals = GetFromCache(pindexPrev); const int height = pindexPrev->nHeight + 1; for (auto it = signals.begin(); it != signals.end(); ) { - if (height > it->second + Params().GetConsensus().nExpireEHF) { - LogPrintf("CMNHFManager::GetSignalsStage: mnhf signal bit=%d height:%d is expired at height=%d\n", it->first, it->second, height); + bool found{false}; + const auto signal_pindex = pindexPrev->GetAncestor(it->second); + assert(signal_pindex != nullptr); + const int64_t signal_time = signal_pindex->GetMedianTimePast(); + for (int index = 0; index < Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++index) { + const auto& deployment = Params().GetConsensus().vDeployments[index]; + if (deployment.bit != it->first) continue; + if (signal_time < deployment.nStartTime) { + // new deployment is using the same bit as the old one + LogPrintf("CMNHFManager::GetSignalsStage: mnhf signal bit=%d height:%d is expired at height=%d\n", it->first, it->second, height); + it = signals.erase(it); + } else { + ++it; + } + found = true; + break; + } + if (!found) { + // no deployment means we buried it and aren't using the same bit (yet) + LogPrintf("CMNHFManager::GetSignalsStage: mnhf signal bit=%d height:%d is not known at height=%d\n", it->first, it->second, height); it = signals.erase(it); - } else { - ++it; - } + } } return signals; } diff --git a/test/functional/feature_mnehf.py b/test/functional/feature_mnehf.py index 1a082395f8..9498013e86 100755 --- a/test/functional/feature_mnehf.py +++ b/test/functional/feature_mnehf.py @@ -25,7 +25,7 @@ from test_framework.util import ( class MnehfTest(DashTestFramework): def set_test_params(self): - extra_args = [["-vbparams=testdummy:0:999999999999:12:12:12:5:0"] for _ in range(4)] + extra_args = [["-vbparams=testdummy:0:999999999999:12:12:12:5:0", "-persistmempool=0"] for _ in range(4)] self.set_dash_test_params(4, 3, fast_dip3_enforcement=True, extra_args=extra_args) def skip_test_if_missing_module(self): @@ -164,14 +164,12 @@ class MnehfTest(DashTestFramework): ehf_tx_sent = self.send_tx(ehf_tx) ehf_unknown_tx_sent = self.send_tx(ehf_unknown_tx) self.send_tx(ehf_invalid_tx, expected_error='bad-mnhf-non-ehf') - node.generate(1) - ehf_height = node.getblockcount() + ehf_blockhash = node.generate(1)[0] self.sync_all() - ehf_block = node.getbestblockhash() - self.log.info(f"Check MnEhfTx {ehf_tx_sent} was mined in {ehf_block}") - assert ehf_tx_sent in node.getblock(ehf_block)['tx'] - assert ehf_unknown_tx_sent in node.getblock(ehf_block)['tx'] + self.log.info(f"Check MnEhfTx {ehf_tx_sent} was mined in {ehf_blockhash}") + assert ehf_tx_sent in node.getblock(ehf_blockhash)['tx'] + assert ehf_unknown_tx_sent in node.getblock(ehf_blockhash)['tx'] self.log.info(f"MnEhf tx: '{ehf_tx}' is sent: {ehf_tx_sent}") self.log.info(f"MnEhf 'unknown' tx: '{ehf_unknown_tx}' is sent: {ehf_unknown_tx_sent}") @@ -201,10 +199,10 @@ class MnehfTest(DashTestFramework): self.check_fork('active') - block_fork_active = node.getbestblockhash() - self.log.info(f"Invalidate block: {ehf_block} with tip {block_fork_active}") + fork_active_blockhash = node.getbestblockhash() + self.log.info(f"Invalidate block: {ehf_blockhash} with tip {fork_active_blockhash}") for inode in self.nodes: - inode.invalidateblock(ehf_block) + inode.invalidateblock(ehf_blockhash) self.log.info("Expecting for fork to be defined in next blocks because no MnEHF tx here") for i in range(12): @@ -215,12 +213,11 @@ class MnehfTest(DashTestFramework): self.log.info("Re-sending MnEHF for new fork") tx_sent_2 = self.send_tx(ehf_tx) - node.generate(1) + ehf_blockhash_2 = node.generate(1)[0] self.sync_all() - ehf_block_2 = node.getbestblockhash() - self.log.info(f"Check MnEhfTx again {tx_sent_2} was mined in {ehf_block_2}") - assert tx_sent_2 in node.getblock(ehf_block_2)['tx'] + self.log.info(f"Check MnEhfTx again {tx_sent_2} was mined in {ehf_blockhash_2}") + assert tx_sent_2 in node.getblock(ehf_blockhash_2)['tx'] self.log.info(f"Generate some more block to jump to `started` status") for i in range(12): @@ -230,35 +227,37 @@ class MnehfTest(DashTestFramework): self.check_fork('started') - self.log.info(f"Re-consider block {ehf_block} to the old MnEHF and forget new fork") + self.log.info(f"Re-consider block {ehf_blockhash} to the old MnEHF and forget new fork") for inode in self.nodes: - inode.reconsiderblock(ehf_block) - assert_equal(node.getbestblockhash(), block_fork_active) + inode.reconsiderblock(ehf_blockhash) + assert_equal(node.getbestblockhash(), fork_active_blockhash) self.check_fork('active') self.restart_all_nodes() self.check_fork('active') + self.log.info("Testing duplicate EHF signal with same bit") + ehf_tx_duplicate = self.send_tx(self.create_mnehf(28, pubkey)) + tip_blockhash = node.generate(1)[0] + self.sync_blocks() + block = node.getblock(tip_blockhash) + assert ehf_tx_duplicate in node.getrawmempool() and ehf_tx_duplicate not in block['tx'] + + self.log.info("Testing EHF signal with same bit but with newer start time") self.bump_mocktime(int(60 * 60 * 24 * 14)) node.generate(1) - self.sync_all() + self.sync_blocks() self.restart_all_nodes(params=[self.mocktime, self.mocktime + 1000000]) self.mine_quorum() - ehf_tx_second = self.create_mnehf(28, pubkey) - assert_equal(get_bip9_details(node, 'testdummy')['status'], 'defined') + ehf_tx_new_start = self.create_mnehf(28, pubkey) + self.check_fork('defined') - self.log.info("Testing EHF signal with same bit") - self.log.info(f"Previous signal at height={ehf_height}, total blocks={node.getblockcount()}, should success at {ehf_height + 576}") - self.slowly_generate_batch(576 - (node.getblockcount() - ehf_height) - 1) - ehf_tx_sent = self.send_tx(ehf_tx_second) - self.log.info("Mine block and ensure not mined yet...") - node.generate(1) - self.ensure_tx_is_not_mined(ehf_tx_sent) - node.generate(1) + self.log.info("Mine one block and ensure EHF tx for the new deployment is mined") + ehf_tx_sent = self.send_tx(ehf_tx_new_start) + tip_blockhash = node.generate(1)[0] self.sync_all() - self.log.info("Mine one more block and ensure it is mined") - block = node.getblock(node.getbestblockhash()) + block = node.getblock(tip_blockhash) assert ehf_tx_sent in block['tx'] self.check_fork('defined') @@ -266,6 +265,5 @@ class MnehfTest(DashTestFramework): self.check_fork('active') - if __name__ == '__main__': MnehfTest().main()