[Consensus] Bury segwit deployment

Hardcode segwit deployment height to 481824 for mainnet.
This commit is contained in:
John Newbery committed 2019-08-14 15:52:52 -04:00
1 parent 1c93b9b31c
commit 0328dcdcfc
15 files changed
+71 -113

No files matched your search

+1 -1
View File
@@ -41,7 +41,7 @@ class NULLDUMMYTest(BitcoinTestFramework):
self.setup_clean_chain = True
# This script tests NULLDUMMY activation, which is part of the 'segwit' deployment, so we go through
# normal segwit activation here (and don't use the default always-on behaviour).
self.extra_args = [['-whitelist=127.0.0.1', '-vbparams=segwit:0:999999999999', '-addresstype=legacy']]
self.extra_args = [['-whitelist=127.0.0.1', '-segwitheight=432', '-addresstype=legacy']]
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()