Skip to content

chore: Drop MSG_LEGACY_TXLOCK_REQUEST/LEGACYTXLOCKREQUEST #5483

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

Merged
UdjinM6 merged 1 commit into from
Jul 16, 2023
Merged

chore: Drop MSG_LEGACY_TXLOCK_REQUEST/LEGACYTXLOCKREQUEST #5483

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
6 changes: 1 addition & 5 deletions src/net_processing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1783,7 +1783,6 @@ bool PeerManagerImpl::AlreadyHave(const CInv& inv)
{
case MSG_TX:
case MSG_DSTX:
case MSG_LEGACY_TXLOCK_REQUEST: // we treat legacy IX messages as TX messages
{
assert(recentRejects);
if (m_chainman.ActiveChain().Tip()->GetBlockHash() != hashRecentRejectsChainTip)
Expand Down Expand Up @@ -3502,17 +3501,14 @@ void PeerManagerImpl::ProcessMessage(
return;
}

if (msg_type == NetMsgType::TX || msg_type == NetMsgType::DSTX || msg_type == NetMsgType::LEGACYTXLOCKREQUEST) {
if (msg_type == NetMsgType::TX || msg_type == NetMsgType::DSTX) {
CTransactionRef ptx;
CCoinJoinBroadcastTx dstx;
int nInvType = MSG_TX;

// Read data and assign inv type
if(msg_type == NetMsgType::TX) {
vRecv >> ptx;
} else if(msg_type == NetMsgType::LEGACYTXLOCKREQUEST) {
// we keep processing the legacy IX message here but revert to handling it as a regular TX
vRecv >> ptx;
} else if (msg_type == NetMsgType::DSTX) {
vRecv >> dstx;
ptx = dstx.tx;
Expand Down
4 changes: 0 additions & 4 deletions src/protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ MAKE_MSG(CFHEADERS, "cfheaders");
MAKE_MSG(GETCFCHECKPT, "getcfcheckpt");
MAKE_MSG(CFCHECKPT, "cfcheckpt");
// Dash message types
MAKE_MSG(LEGACYTXLOCKREQUEST, "ix");
MAKE_MSG(SPORK, "spork");
MAKE_MSG(GETSPORKS, "getsporks");
MAKE_MSG(DSACCEPT, "dsa");
Expand Down Expand Up @@ -129,7 +128,6 @@ const static std::string allNetMessageTypes[] = {
NetMsgType::CFCHECKPT,
// Dash message types
// NOTE: do NOT include non-implmented here, we want them to be "Unknown command" in ProcessMessage()
NetMsgType::LEGACYTXLOCKREQUEST,
NetMsgType::SPORK,
NetMsgType::GETSPORKS,
NetMsgType::SENDDSQUEUE,
Expand Down Expand Up @@ -186,7 +184,6 @@ const static std::string netMessageTypesViolateBlocksOnly[] = {
NetMsgType::DSSTATUSUPDATE,
NetMsgType::DSTX,
NetMsgType::DSVIN,
NetMsgType::LEGACYTXLOCKREQUEST,
NetMsgType::QBSIGSHARES,
NetMsgType::QCOMPLAINT,
NetMsgType::QCONTRIB,
Expand Down Expand Up @@ -312,7 +309,6 @@ const char* CInv::GetCommandInternal() const
case MSG_TX: return NetMsgType::TX;
case MSG_BLOCK: return NetMsgType::BLOCK;
case MSG_FILTERED_BLOCK: return NetMsgType::MERKLEBLOCK;
case MSG_LEGACY_TXLOCK_REQUEST: return NetMsgType::LEGACYTXLOCKREQUEST;
case MSG_CMPCT_BLOCK: return NetMsgType::CMPCTBLOCK;
case MSG_SPORK: return NetMsgType::SPORK;
case MSG_DSTX: return NetMsgType::DSTX;
Expand Down
7 changes: 3 additions & 4 deletions src/protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ extern const char *CFCHECKPT;
// Dash message types
// NOTE: do NOT declare non-implmented here, we don't want them to be exposed to the outside
// TODO: add description
extern const char *LEGACYTXLOCKREQUEST; // only present for backwards compatibility
extern const char *SPORK;
extern const char *GETSPORKS;
extern const char *DSACCEPT;
Expand Down Expand Up @@ -448,9 +447,9 @@ enum GetDataMsg {
// The following can only occur in getdata. Invs always use TX or BLOCK.
MSG_FILTERED_BLOCK = 3, //!< Defined in BIP37
// Dash message types
// NOTE: declare non-implmented here, we must keep this enum consistent and backwards compatible
MSG_LEGACY_TXLOCK_REQUEST = 4,
/* MSG_TXLOCK_VOTE = 5, Legacy InstantSend and not used anymore */
// NOTE: we must keep this enum consistent and backwards compatible
/* MSG_LEGACY_TXLOCK_REQUEST = 4, */ // Legacy InstantSend and not used anymore
/* MSG_TXLOCK_VOTE = 5, */ // Legacy InstantSend and not used anymore
MSG_SPORK = 6,
/* 7 - 15 were used in old Dash versions and were mainly budget and MN broadcast/ping related*/
MSG_DSTX = 16,
Expand Down