diff --git a/src/protocol.cpp b/src/protocol.cpp index fc03795959..dd8da8716a 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -334,7 +334,6 @@ static std::string serviceFlagToStr(size_t bit) case NODE_NETWORK: return "NETWORK"; case NODE_GETUTXO: return "GETUTXO"; case NODE_BLOOM: return "BLOOM"; - case NODE_XTHIN: return "XTHIN"; case NODE_COMPACT_FILTERS: return "COMPACT_FILTERS"; case NODE_NETWORK_LIMITED: return "NETWORK_LIMITED"; // Not using default, so we get warned when a case is missing diff --git a/src/protocol.h b/src/protocol.h index 7bf1e5011d..ca6ac5c7f6 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2015 The Bitcoin Core developers +// Copyright (c) 2009-2019 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -314,9 +314,6 @@ enum ServiceFlags : uint64_t { // Dash Core nodes used to support this by default, without advertising this bit, // but no longer do as of protocol version 70201 (= NO_BLOOM_VERSION) NODE_BLOOM = (1 << 2), - // NODE_XTHIN means the node supports Xtreme Thinblocks - // If this is turned off then the node will not service nor make xthin requests - NODE_XTHIN = (1 << 4), // NODE_COMPACT_FILTERS means the node will service basic block filter requests. // See BIP157 and BIP158 for details on how this is implemented. NODE_COMPACT_FILTERS = (1 << 6), diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index bd0407bbb3..b212acef9e 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -15,10 +15,10 @@ #include #include -#include #include #include #include +#include #include #include