Skip to content

fix: disable legacy spork P2P on mainnet #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thepastaclaw wants to merge 1 commit into
base: refactor-spork-net-processing-v2
Choose a base branch
from
Draft

fix: disable legacy spork P2P on mainnet #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/net_processing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2365,7 +2365,8 @@ bool PeerManagerImpl::AlreadyHave(const CInv& inv)

case MSG_SPORK:
{
return m_sporkman.GetSporkByHash(inv.hash).has_value();
return m_chainparams.NetworkIDString() == CBaseChainParams::MAIN ||
m_sporkman.GetSporkByHash(inv.hash).has_value();
}

case MSG_GOVERNANCE_OBJECT:
Expand Down Expand Up @@ -2473,6 +2474,8 @@ void PeerManagerImpl::PushInventory(NodeId nodeid, const CInv& inv)

void PeerManagerImpl::RelayInv(const CInv& inv, const int minProtoVersion)
{
if (inv.type == MSG_SPORK && m_chainparams.NetworkIDString() == CBaseChainParams::MAIN) return;

// TODO: Migrate to iteration through m_peer_map
m_connman.ForEachNode([&](CNode* pnode) {
if (pnode->nVersion < minProtoVersion || !pnode->CanRelay())
Expand All @@ -2486,6 +2489,8 @@ void PeerManagerImpl::RelayInv(const CInv& inv, const int minProtoVersion)

void PeerManagerImpl::RelayInv(const CInv& inv)
{
if (inv.type == MSG_SPORK && m_chainparams.NetworkIDString() == CBaseChainParams::MAIN) return;

READ_LOCK(m_peer_mutex);
for (const auto& [_, peer] : m_peer_map) {
if (!peer->GetInvRelay()) continue;
Expand Down Expand Up @@ -2930,7 +2935,7 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic
}
}

if (!push && inv.type == MSG_SPORK) {
if (!push && inv.type == MSG_SPORK && m_chainparams.NetworkIDString() != CBaseChainParams::MAIN) {
if (auto opt_spork = m_sporkman.GetSporkByHash(inv.hash)) {
m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::SPORK, *opt_spork));
push = true;
Expand Down Expand Up @@ -3760,6 +3765,7 @@ void PeerManagerImpl::ProcessMessage(
::g_stats_client->inc("message.received." + SanitizeString(msg_type), 1.0f);

const bool is_masternode = m_active_ctx != nullptr;
const bool p2p_sporks_enabled = m_chainparams.NetworkIDString() != CBaseChainParams::MAIN;

PeerRef peer = GetPeerRef(pfrom.GetId());
if (peer == nullptr) return;
Expand Down Expand Up @@ -4344,6 +4350,11 @@ void PeerManagerImpl::ProcessMessage(

if (interruptMsgProc) return;

if (inv.type == MSG_SPORK && m_chainparams.NetworkIDString() == CBaseChainParams::MAIN) {
LogPrint(BCLog::NET, "Ignoring mainnet spork inventory %s peer=%d\n", inv.hash.ToString(), pfrom.GetId());
continue;
}

if (inv.IsMsgBlk()) {
const bool fAlreadyHave = AlreadyHaveBlock(inv.hash);
LogPrint(BCLog::NET, "got inv: %s %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId());
Expand Down Expand Up @@ -5463,6 +5474,8 @@ void PeerManagerImpl::ProcessMessage(
}

if (msg_type == NetMsgType::SPORK) {
if (!p2p_sporks_enabled) return;

CSporkMessage spork;
vRecv >> spork;

Expand All @@ -5480,6 +5493,10 @@ void PeerManagerImpl::ProcessMessage(
}

if (msg_type == NetMsgType::GETSPORKS) {
// Mainnet sporks are hardened. Keep the legacy p2p message accepted,
// but return an empty response instead of serving cached spork state.
if (!p2p_sporks_enabled) return;

// For 'getsporks', active sporks is sent to the requesting peer.
auto active_sporks = m_sporkman.ActiveSporks();
for (const auto& pair : active_sporks) {
Expand Down
4 changes: 3 additions & 1 deletion src/node/sync_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,9 @@ void SyncManager::ProcessTick()

// SPORK : ALWAYS ASK FOR SPORKS AS WE SYNC

if (!m_netfulfilledman.HasFulfilledRequest(pnode->addr, "spork-sync")) {
// Mainnet sporks are hardened, so do not request legacy p2p spork state.
if (Params().NetworkIDString() != CBaseChainParams::MAIN &&
!m_netfulfilledman.HasFulfilledRequest(pnode->addr, "spork-sync")) {
// always get sporks first, only request once from each peer
m_netfulfilledman.AddFulfilledRequest(pnode->addr, "spork-sync");
// get current network sporks
Expand Down