diff --git a/src/consensus/activation.cpp b/src/consensus/activation.cpp index 82eca2a4a..8806fad84 100644 --- a/src/consensus/activation.cpp +++ b/src/consensus/activation.cpp @@ -1,83 +1,82 @@ // Copyright (c) 2018-2019 The Bitcoin developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include #include #include #include static bool IsUAHFenabled(const Consensus::Params ¶ms, int nHeight) { return nHeight >= params.uahfHeight; } bool IsUAHFenabled(const Consensus::Params ¶ms, const CBlockIndex *pindexPrev) { if (pindexPrev == nullptr) { return false; } return IsUAHFenabled(params, pindexPrev->nHeight); } static bool IsDAAEnabled(const Consensus::Params ¶ms, int nHeight) { return nHeight >= params.daaHeight; } bool IsDAAEnabled(const Consensus::Params ¶ms, const CBlockIndex *pindexPrev) { if (pindexPrev == nullptr) { return false; } return IsDAAEnabled(params, pindexPrev->nHeight); } bool IsMagneticAnomalyEnabled(const Consensus::Params ¶ms, int32_t nHeight) { return nHeight >= params.magneticAnomalyHeight; } bool IsMagneticAnomalyEnabled(const Consensus::Params ¶ms, const CBlockIndex *pindexPrev) { if (pindexPrev == nullptr) { return false; } return IsMagneticAnomalyEnabled(params, pindexPrev->nHeight); } static bool IsGravitonEnabled(const Consensus::Params ¶ms, int32_t nHeight) { return nHeight >= params.gravitonHeight; } bool IsGravitonEnabled(const Consensus::Params ¶ms, const CBlockIndex *pindexPrev) { if (pindexPrev == nullptr) { return false; } return IsGravitonEnabled(params, pindexPrev->nHeight); } bool IsPhononEnabled(const Consensus::Params ¶ms, const CBlockIndex *pindexPrev) { if (pindexPrev == nullptr) { return false; } - return pindexPrev->GetMedianTimePast() >= - gArgs.GetArg("-phononactivationtime", params.phononActivationTime); + return pindexPrev->GetMedianTimePast() >= params.phononActivationTime; } bool IsAxionEnabled(const Consensus::Params ¶ms, const CBlockIndex *pindexPrev) { if (pindexPrev == nullptr) { return false; } return pindexPrev->GetMedianTimePast() >= gArgs.GetArg("-axionactivationtime", params.axionActivationTime); } diff --git a/src/init.cpp b/src/init.cpp index db654f18d..14f90859f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,2799 +1,2797 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) #include #endif #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include