Skip to content

Commit b2ee8b2

Browse files
committed
net: Deserialize hardcoded seeds from BIP155 blob
Switch from IPv6 slot-based format to more compact and flexible BIP155 format.
1 parent 9b29d5d commit b2ee8b2

File tree

4 files changed

+1211
-1192
lines changed

4 files changed

+1211
-1192
lines changed

src/chainparams.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class CMainParams : public CChainParams {
134134

135135
bech32_hrp = "bc";
136136

137-
vFixedSeeds = std::vector<SeedSpec6>(std::begin(pnSeed6_main), std::end(pnSeed6_main));
137+
vFixedSeeds = std::vector<uint8_t>(std::begin(chainparams_seed_main), std::end(chainparams_seed_main));
138138

139139
fDefaultConsistencyChecks = false;
140140
fRequireStandard = true;
@@ -239,7 +239,7 @@ class CTestNetParams : public CChainParams {
239239

240240
bech32_hrp = "tb";
241241

242-
vFixedSeeds = std::vector<SeedSpec6>(std::begin(pnSeed6_test), std::end(pnSeed6_test));
242+
vFixedSeeds = std::vector<uint8_t>(std::begin(chainparams_seed_test), std::end(chainparams_seed_test));
243243

244244
fDefaultConsistencyChecks = false;
245245
fRequireStandard = false;

src/chainparams.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
#include <memory>
1515
#include <vector>
1616

17-
struct SeedSpec6 {
18-
uint8_t addr[16];
19-
uint16_t port;
20-
};
21-
2217
typedef std::map<int, uint256> MapCheckpoints;
2318

2419
struct CCheckpointData {
@@ -108,7 +103,7 @@ class CChainParams
108103
const std::vector<std::string>& DNSSeeds() const { return vSeeds; }
109104
const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
110105
const std::string& Bech32HRP() const { return bech32_hrp; }
111-
const std::vector<SeedSpec6>& FixedSeeds() const { return vFixedSeeds; }
106+
const std::vector<uint8_t>& FixedSeeds() const { return vFixedSeeds; }
112107
const CCheckpointData& Checkpoints() const { return checkpointData; }
113108

114109
//! Get allowed assumeutxo configuration.
@@ -130,7 +125,7 @@ class CChainParams
130125
std::string bech32_hrp;
131126
std::string strNetworkID;
132127
CBlock genesis;
133-
std::vector<SeedSpec6> vFixedSeeds;
128+
std::vector<uint8_t> vFixedSeeds;
134129
bool fDefaultConsistencyChecks;
135130
bool fRequireStandard;
136131
bool m_is_test_chain;

0 commit comments

Comments
 (0)