highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-10-04 19:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

addrinfo: raise helpfully on server error or incompatible server version

Browse Source
This commit is contained in:
Jon Atack
2021-04-09 09:40:57 +02:00
parent bb85cbc4f7
commit edf3167151
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/bitcoin-cli.cpp
View File

@@ -256,9 +256,14 @@ public:
UniValue ProcessReply(const UniValue& reply) override UniValue ProcessReply(const UniValue& reply) override
{ {
if (!reply["error"].isNull()) return reply;
const std::vector<UniValue>& nodes{reply["result"].getValues()};
if (!nodes.empty() && nodes.at(0)["network"].isNull()) {
throw std::runtime_error("-addrinfo requires bitcoind server to be running v22.0 and up");
}
// Count the number of peers we know by network, including torv2 versus torv3. // Count the number of peers we know by network, including torv2 versus torv3.
std::array<uint64_t, m_networks_size> counts{{}}; std::array<uint64_t, m_networks_size> counts{{}};
for (const UniValue& node : reply["result"].getValues()) { for (const UniValue& node : nodes) {
std::string network_name{node["network"].get_str()}; std::string network_name{node["network"].get_str()};
if (network_name == "onion") { if (network_name == "onion") {
network_name = node["address"].get_str().size() > 22 ? "torv3" : "torv2"; network_name = node["address"].get_str().size() > 22 ? "torv3" : "torv2";