diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -1976,11 +1976,6 @@ nLocalServices = ServiceFlags(nLocalServices | NODE_BLOOM); } - // Signal Bitcoin Cash support. - // TODO: remove some time after the hardfork when no longer needed - // to differentiate the network nodes. - nLocalServices = ServiceFlags(nLocalServices | NODE_BITCOIN_CASH); - nMaxTipAge = gArgs.GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE); return true; diff --git a/src/protocol.h b/src/protocol.h --- a/src/protocol.h +++ b/src/protocol.h @@ -333,13 +333,9 @@ // 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_BITCOIN_CASH means the node supports Bitcoin Cash and the - // associated consensus rule changes. - // This service bit is intended to be used prior until some time after the - // UAHF activation when the Bitcoin Cash network has adequately separated. - // TODO: remove (free up) the NODE_BITCOIN_CASH service bit once no longer - // needed. - NODE_BITCOIN_CASH = (1 << 5), + + // Bit 5 was NODE_BITCOIN_CASH, removed in v0.22.8 + // NODE_NETWORK_LIMITED means the same as NODE_NETWORK with the limitation // of only serving the last 288 (2 day) blocks // See BIP159 for details on how this is implemented. diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -771,9 +771,6 @@ case NODE_XTHIN: strList.append("XTHIN"); break; - case NODE_BITCOIN_CASH: - strList.append("CASH"); - break; case NODE_NETWORK_LIMITED: strList.append("LIMITED"); break; diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -880,9 +880,6 @@ if (services & NODE_XTHIN) { servicesNames.push_back("XTHIN"); } - if (services & NODE_BITCOIN_CASH) { - servicesNames.push_back("BITCOIN_CASH"); - } if (services & NODE_NETWORK_LIMITED) { servicesNames.push_back("NETWORK_LIMITED"); } diff --git a/src/seeder/bitcoin.cpp b/src/seeder/bitcoin.cpp --- a/src/seeder/bitcoin.cpp +++ b/src/seeder/bitcoin.cpp @@ -82,7 +82,7 @@ uint64_t nLocalNonce = BITCOIN_SEED_NONCE; int64_t nLocalServices = 0; CService myService; - CAddress me(myService, ServiceFlags(NODE_NETWORK | NODE_BITCOIN_CASH)); + CAddress me(myService, ServiceFlags(NODE_NETWORK)); BeginMessage(NetMsgType::VERSION); int nBestHeight = GetRequireHeight(); std::string ver = "/bitcoin-cash-seeder:0.15/"; @@ -228,7 +228,7 @@ CSeederNode::CSeederNode(const CService &ip, std::vector *vAddrIn) : sock(INVALID_SOCKET), vSend(SER_NETWORK, 0), vRecv(SER_NETWORK, 0), nHeaderStart(-1), nMessageStart(-1), nVersion(0), vAddr(vAddrIn), ban(0), - doneAfter(0), you(ip, ServiceFlags(NODE_NETWORK | NODE_BITCOIN_CASH)) { + doneAfter(0), you(ip, ServiceFlags(NODE_NETWORK)) { if (time(nullptr) > 1329696000) { vSend.SetVersion(209); vRecv.SetVersion(209); diff --git a/src/seeder/test/p2p_messaging_tests.cpp b/src/seeder/test/p2p_messaging_tests.cpp --- a/src/seeder/test/p2p_messaging_tests.cpp +++ b/src/seeder/test/p2p_messaging_tests.cpp @@ -73,8 +73,7 @@ BOOST_AUTO_TEST_CASE(seeder_node_version_test) { CService serviceFrom; - CAddress addrFrom(serviceFrom, - ServiceFlags(NODE_NETWORK | NODE_BITCOIN_CASH)); + CAddress addrFrom(serviceFrom, ServiceFlags(NODE_NETWORK)); CDataStream versionMessage = CreateVersionMessage(time(nullptr), vAddr[0], addrFrom, diff --git a/test/functional/p2p_node_network_limited.py b/test/functional/p2p_node_network_limited.py --- a/test/functional/p2p_node_network_limited.py +++ b/test/functional/p2p_node_network_limited.py @@ -12,7 +12,6 @@ CInv, msg_getdata, msg_verack, - NODE_BITCOIN_CASH, NODE_BLOOM, NODE_NETWORK_LIMITED, ) @@ -70,7 +69,7 @@ def run_test(self): node = self.nodes[0].add_p2p_connection(P2PIgnoreInv()) - expected_services = NODE_BLOOM | NODE_BITCOIN_CASH | NODE_NETWORK_LIMITED + expected_services = NODE_BLOOM | NODE_NETWORK_LIMITED self.log.info("Check that node has signalled expected services.") assert_equal(node.nServices, expected_services) diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -50,7 +50,6 @@ NODE_BLOOM = (1 << 2) # NODE_WITNESS = (1 << 3) NODE_XTHIN = (1 << 4) -NODE_BITCOIN_CASH = (1 << 5) NODE_NETWORK_LIMITED = (1 << 10) NODE_AVALANCHE = (1 << 24)