sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #6281: chore: bump MIN_PEER_PROTO_VERSION to 70216

Browse Source 
4602e09751 chore: bump `MIN_PEER_PROTO_VERSION` to `70216` (Kittywhiskers Van Gogh)
ee4115e734 revert: Only sync mempool from v0.15+ (proto 70216+) nodes (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  Extracted from [dash#6272](https://github.com/dashpay/dash/pull/6272)

  ## Breaking Changes

  None expected.

  ## Checklist:

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)**
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 4602e09751
  PastaPastaPasta:
    utACK 4602e09751

Tree-SHA512: b3bc821c3e50d3fbd3d2d475cde4ccfca2ebedbaedf7209020c0007ca60a946a4e999775747b0b9615106b053ce0febbeaaf12106dfa810d5f3d2e98f8e73aaf
This commit is contained in:
pasta 2024-09-24 13:48:15 -05:00
commit 52928c548e
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/release-notes-6281.md Normal file
View File

@ -0,0 +1,4 @@
P2P and Network Changes
-----------------------
`MIN_PEER_PROTO_VERSION` has been bumped to `70216`

2
src/masternode/sync.cpp
View File

@ -206,7 +206,7 @@ void CMasternodeSync::ProcessTick(const PeerManager& peerman)
// Now that the blockchain is synced request the mempool from the connected outbound nodes if possible // Now that the blockchain is synced request the mempool from the connected outbound nodes if possible
for (auto pNodeTmp : snap.Nodes()) { for (auto pNodeTmp : snap.Nodes()) {
bool fRequestedEarlier = m_netfulfilledman.HasFulfilledRequest(pNodeTmp->addr, "mempool-sync"); bool fRequestedEarlier = m_netfulfilledman.HasFulfilledRequest(pNodeTmp->addr, "mempool-sync");
if (pNodeTmp->nVersion >= 70216 && !pNodeTmp->IsInboundConn() && !fRequestedEarlier && !pNodeTmp->IsBlockRelayOnly()) { if (!pNodeTmp->IsInboundConn() && !fRequestedEarlier && !pNodeTmp->IsBlockRelayOnly()) {
m_netfulfilledman.AddFulfilledRequest(pNodeTmp->addr, "mempool-sync"); m_netfulfilledman.AddFulfilledRequest(pNodeTmp->addr, "mempool-sync");
connman.PushMessage(pNodeTmp, msgMaker.Make(NetMsgType::MEMPOOL)); connman.PushMessage(pNodeTmp, msgMaker.Make(NetMsgType::MEMPOOL));
LogPrint(BCLog::MNSYNC, "CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- syncing mempool from peer=%d\n", nTick, nCurrentAsset, pNodeTmp->GetId()); LogPrint(BCLog::MNSYNC, "CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- syncing mempool from peer=%d\n", nTick, nCurrentAsset, pNodeTmp->GetId());

2
src/version.h
View File

@ -17,7 +17,7 @@ static const int PROTOCOL_VERSION = 70235;
static const int INIT_PROTO_VERSION = 209; static const int INIT_PROTO_VERSION = 209;
//! disconnect from peers older than this proto version //! disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION = 70215; static const int MIN_PEER_PROTO_VERSION = 70216;
//! minimum proto version of masternode to accept in DKGs //! minimum proto version of masternode to accept in DKGs
static const int MIN_MASTERNODE_PROTO_VERSION = 70233; static const int MIN_MASTERNODE_PROTO_VERSION = 70233;