diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/chainparams.cpp | 8 | ||||
| -rw-r--r-- | src/consensus/params.h | 14 |
2 files changed, 5 insertions, 17 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 4a5546a5e..a3e34271f 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -101,7 +101,7 @@ public: consensus.nAuxpowChainId = 0x0062; // 98 - Josh Wise! consensus.fStrictChainId = true; - consensus.nLegacyBlocksBefore = 371337; + consensus.nAuxPowHeight = 371337; /** * The message start string is designed to be unlikely to occur in normal data. @@ -222,7 +222,7 @@ public: consensus.nAuxpowChainId = 0x0062; // 98 - Josh Wise! consensus.fStrictChainId = false; - consensus.nLegacyBlocksBefore = 158100; + consensus.nAuxPowHeight = 158100; pchMessageStart[0] = 0xfc; pchMessageStart[1] = 0xc1; @@ -355,7 +355,7 @@ public: consensus.nAuxpowChainId = 0x0062; // 98 - Josh Wise! consensus.fStrictChainId = true; - consensus.nLegacyBlocksBefore = 0; + consensus.nAuxPowHeight = 0; // message start is defined as the first 4 bytes of the sha256d of the block script CHashWriter h(SER_DISK, 0); @@ -431,7 +431,7 @@ public: consensus.nAuxpowChainId = 0x0062; // 98 - Josh Wise! consensus.fStrictChainId = true; - consensus.nLegacyBlocksBefore = 0; + consensus.nAuxPowHeight = 0; pchMessageStart[0] = 0xfa; pchMessageStart[1] = 0xbf; diff --git a/src/consensus/params.h b/src/consensus/params.h index baf841e33..d16cb6338 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -99,19 +99,7 @@ struct Params { /** Auxpow parameters */ int32_t nAuxpowChainId; bool fStrictChainId; - int nLegacyBlocksBefore; // -1 for "always allow" - - /** - * Check whether or not to allow legacy blocks at the given height. - * @param nHeight Height of the block to check. - * @return True if it is allowed to have a legacy version. - */ - bool AllowLegacyBlocks(unsigned nHeight) const - { - if (nLegacyBlocksBefore < 0) - return true; - return static_cast<int> (nHeight) < nLegacyBlocksBefore; - } + int nAuxPowHeight; // 0 for "always on" }; } // namespace Consensus |