From 867786d777a90fb1301772330460dff6a33f0c43 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 24 Apr 2019 08:40:17 -0700 Subject: [PATCH] Enable experimental feature -developersetpoolsizezero on mainnet. --- src/main.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 72744b61a..927435ffe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3451,17 +3451,12 @@ void FallbackSproutValuePoolBalance( const CChainParams& chainparams ) { - // We might not want to enable the checkpointing for mainnet - // yet. if (!chainparams.ZIP209Enabled()) { return; } // When developer option -developersetpoolsizezero is enabled, we don't need a fallback balance. - if ((chainparams.NetworkIDString() == "test" || chainparams.NetworkIDString() == "regtest") && - fExperimentalMode && - mapArgs.count("-developersetpoolsizezero")) - { + if (fExperimentalMode && mapArgs.count("-developersetpoolsizezero")) { return; } @@ -4252,13 +4247,10 @@ bool static LoadBlockIndexDB() // Fall back to hardcoded Sprout value pool balance FallbackSproutValuePoolBalance(pindex, chainparams); - // If developer option -developersetpoolsizezero has been enabled on testnet or in regtest mode, + // If developer option -developersetpoolsizezero has been enabled, // override and set the in-memory size of shielded pools to zero. An unshielding transaction // can then be used to trigger and test the handling of turnstile violations. - if ((chainparams.NetworkIDString() == "test" || chainparams.NetworkIDString() == "regtest") && - fExperimentalMode && - mapArgs.count("-developersetpoolsizezero")) - { + if (fExperimentalMode && mapArgs.count("-developersetpoolsizezero")) { pindex->nChainSproutValue = 0; pindex->nChainSaplingValue = 0; }