DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

net: Check against the next epoch's version when evicting peers

Browse Source
This commit is contained in:
Jack Grigg
2018-09-12 10:10:22 +01:00
parent 07d3f947ec
commit feee210af6
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/net.cpp
View File

@@ -820,22 +820,26 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
} }
const Consensus::Params& params = Params().GetConsensus(); const Consensus::Params& params = Params().GetConsensus();
int nActivationHeight = params.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight; auto nextEpoch = NextEpoch(height, params);
if (nextEpoch) {
auto idx = nextEpoch.get();
int nActivationHeight = params.vUpgrades[idx].nActivationHeight;
if (nActivationHeight > 0 && if (nActivationHeight > 0 &&
height < nActivationHeight && height < nActivationHeight &&
height >= nActivationHeight - NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD) height >= nActivationHeight - NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD)
{ {
// Find any nodes which don't support Overwinter protocol version // Find any nodes which don't support the protocol version for the next upgrade
BOOST_FOREACH(const CNodeRef &node, vEvictionCandidates) { for (const CNodeRef &node : vEvictionCandidates) {
if (node->nVersion < params.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion) { if (node->nVersion < params.vUpgrades[idx].nProtocolVersion) {
vTmpEvictionCandidates.push_back(node); vTmpEvictionCandidates.push_back(node);
}
} }
}
// Prioritize these nodes by replacing eviction set with them // Prioritize these nodes by replacing eviction set with them
if (vTmpEvictionCandidates.size() > 0) { if (vTmpEvictionCandidates.size() > 0) {
vEvictionCandidates = vTmpEvictionCandidates; vEvictionCandidates = vTmpEvictionCandidates;
}
} }
} }