diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-17 19:35:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-17 19:37:36 +0200 |
| commit | 763828df499f67c1c9d669d3223bd0636ed2b185 (patch) | |
| tree | 8e7d11a20934369676fc9b6bac2fee68b2a6c7d5 | |
| parent | ef3402d9a8cb4b2c8da3bd2b19da3faa7a439b50 (diff) | |
| parent | 2449e12681ab549695f143d9b3ad2c24be03a78d (diff) | |
| download | bitcoin-763828df499f67c1c9d669d3223bd0636ed2b185.tar.xz | |
Merge #8940: Add x9 service bit support to dnsseed.bluematt.me
2449e12 My DNS seed supports filtering (Christian Decker)
ffb4713 Add x9 service bit support to dnsseed.bluematt.me (Matt Corallo)
504c72a Comment that most dnsseeds only support some service bits combos (Matt Corallo)
| -rw-r--r-- | src/chainparams.cpp | 9 | ||||
| -rw-r--r-- | src/net.cpp | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 25ec94b757..7279570855 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -113,12 +113,13 @@ public: assert(consensus.hashGenesisBlock == uint256S("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f")); assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b")); - vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be", true)); // Pieter Wuille - vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); // Matt Corallo + // Note that of those with the service bits flag, most only support a subset of possible options + vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be", true)); // Pieter Wuille, only supports x1, x5, x9, and xd + vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me", true)); // Matt Corallo, only supports x9 vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr - vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Christian Decker + vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com", true)); // Christian Decker, supports x1 - xf vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik - vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch", true)); // Jonas Schnelli + vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch", true)); // Jonas Schnelli, only supports x1, x5, x9, and xd base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0); base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5); diff --git a/src/net.cpp b/src/net.cpp index 19dd040997..5f9942c9dc 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1454,6 +1454,7 @@ static std::string GetDNSHost(const CDNSSeedData& data, ServiceFlags* requiredSe return data.host; } + // See chainparams.cpp, most dnsseeds only support one or two possible servicebits hostnames return strprintf("x%x.%s", *requiredServiceBits, data.host); } |