From 7b52349b11dfce4510b446e0d696912fa09647eb Mon Sep 17 00:00:00 2001 From: Vijay Date: Sat, 18 May 2024 09:30:54 +0530 Subject: [PATCH] Revert "merge #855: Fix bad mn sig ipv6" --- src/evo/deterministicmns.cpp | 6 +++--- src/evo/dmnstate.cpp | 6 +++--- src/evo/providertx.h | 4 ++-- src/evo/simplifiedmns.cpp | 4 ++-- src/llmq/utils.cpp | 4 ++-- src/net.cpp | 12 ++++++------ src/netaddress.cpp | 12 ++++++------ src/netaddress.h | 6 +++--- src/rpc/masternode.cpp | 2 +- src/rpc/quorums.cpp | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp index d02c28cdffbe9..fc2146e22755f 100644 --- a/src/evo/deterministicmns.cpp +++ b/src/evo/deterministicmns.cpp @@ -468,7 +468,7 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr& dmn, bool fBumpTota if (dmn->pdmnState->addr != CService() && !AddUniqueProperty(*dmn, dmn->pdmnState->addr)) { mnUniquePropertyMap = mnUniquePropertyMapSaved; throw(std::runtime_error(strprintf("%s: Can't add a masternode %s with a duplicate address=%s", __func__, - dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false)))); + dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort()))); } if (!AddUniqueProperty(*dmn, dmn->pdmnState->keyIDOwner)) { mnUniquePropertyMap = mnUniquePropertyMapSaved; @@ -509,7 +509,7 @@ void CDeterministicMNList::UpdateMN(const CDeterministicMN& oldDmn, const std::s if (!UpdateUniqueProperty(*dmn, oldState->addr, pdmnState->addr)) { mnUniquePropertyMap = mnUniquePropertyMapSaved; throw(std::runtime_error(strprintf("%s: Can't update a masternode %s with a duplicate address=%s", __func__, - oldDmn.proTxHash.ToString(), pdmnState->addr.ToStringIPPort(false)))); + oldDmn.proTxHash.ToString(), pdmnState->addr.ToStringIPPort()))); } if (!UpdateUniqueProperty(*dmn, oldState->keyIDOwner, pdmnState->keyIDOwner)) { mnUniquePropertyMap = mnUniquePropertyMapSaved; @@ -569,7 +569,7 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash) if (dmn->pdmnState->addr != CService() && !DeleteUniqueProperty(*dmn, dmn->pdmnState->addr)) { mnUniquePropertyMap = mnUniquePropertyMapSaved; throw(std::runtime_error(strprintf("%s: Can't delete a masternode %s with a address=%s", __func__, - proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false)))); + proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort()))); } if (!DeleteUniqueProperty(*dmn, dmn->pdmnState->keyIDOwner)) { mnUniquePropertyMap = mnUniquePropertyMapSaved; diff --git a/src/evo/dmnstate.cpp b/src/evo/dmnstate.cpp index db94abe81c5af..e35d64171dd5d 100644 --- a/src/evo/dmnstate.cpp +++ b/src/evo/dmnstate.cpp @@ -28,7 +28,7 @@ std::string CDeterministicMNState::ToString() const return strprintf("CDeterministicMNState(nVersion=%d, nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, nRevocationReason=%d, " "ownerAddress=%s, pubKeyOperator=%s, votingAddress=%s, addr=%s, payoutAddress=%s, operatorPayoutAddress=%s)", nVersion, nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight, nRevocationReason, - EncodeDestination(PKHash(keyIDOwner)), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), addr.ToStringIPPort(false), payoutAddress, operatorPayoutAddress); + EncodeDestination(PKHash(keyIDOwner)), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), addr.ToStringIPPort(), payoutAddress, operatorPayoutAddress); } UniValue CDeterministicMNState::ToJson(MnType nType) const @@ -36,7 +36,7 @@ UniValue CDeterministicMNState::ToJson(MnType nType) const UniValue obj; obj.setObject(); obj.pushKV("version", nVersion); - obj.pushKV("service", addr.ToStringIPPort(false)); + obj.pushKV("service", addr.ToStringIPPort()); obj.pushKV("registeredHeight", nRegisteredHeight); obj.pushKV("lastPaidHeight", nLastPaidHeight); obj.pushKV("consecutivePayments", nConsecutivePayments); @@ -71,7 +71,7 @@ UniValue CDeterministicMNStateDiff::ToJson(MnType nType) const obj.pushKV("version", state.nVersion); } if (fields & Field_addr) { - obj.pushKV("service", state.addr.ToStringIPPort(false)); + obj.pushKV("service", state.addr.ToStringIPPort()); } if (fields & Field_nRegisteredHeight) { obj.pushKV("registeredHeight", state.nRegisteredHeight); diff --git a/src/evo/providertx.h b/src/evo/providertx.h index 9fbe3af9c6cf6..fc407ebda16cb 100644 --- a/src/evo/providertx.h +++ b/src/evo/providertx.h @@ -96,7 +96,7 @@ class CProRegTx obj.pushKV("type", ToUnderlying(nType)); obj.pushKV("collateralHash", collateralOutpoint.hash.ToString()); obj.pushKV("collateralIndex", (int)collateralOutpoint.n); - obj.pushKV("service", addr.ToString(false)); + obj.pushKV("service", addr.ToString()); obj.pushKV("ownerAddress", EncodeDestination(PKHash(keyIDOwner))); obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting))); @@ -181,7 +181,7 @@ class CProUpServTx obj.pushKV("version", nVersion); obj.pushKV("type", ToUnderlying(nType)); obj.pushKV("proTxHash", proTxHash.ToString()); - obj.pushKV("service", addr.ToString(false)); + obj.pushKV("service", addr.ToString()); if (CTxDestination dest; ExtractDestination(scriptOperatorPayout, dest)) { obj.pushKV("operatorPayoutAddress", EncodeDestination(dest)); } diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp index 919d4107db952..08b0f7757eeff 100644 --- a/src/evo/simplifiedmns.cpp +++ b/src/evo/simplifiedmns.cpp @@ -63,7 +63,7 @@ std::string CSimplifiedMNListEntry::ToString() const } return strprintf("CSimplifiedMNListEntry(nVersion=%d, nType=%d, proRegTxHash=%s, confirmedHash=%s, service=%s, pubKeyOperator=%s, votingAddress=%s, isValid=%d, payoutAddress=%s, operatorPayoutAddress=%s, platformHTTPPort=%d, platformNodeID=%s)", - nVersion, ToUnderlying(nType), proRegTxHash.ToString(), confirmedHash.ToString(), service.ToString(false), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), isValid, payoutAddress, operatorPayoutAddress, platformHTTPPort, platformNodeID.ToString()); + nVersion, ToUnderlying(nType), proRegTxHash.ToString(), confirmedHash.ToString(), service.ToString(), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), isValid, payoutAddress, operatorPayoutAddress, platformHTTPPort, platformNodeID.ToString()); } UniValue CSimplifiedMNListEntry::ToJson(bool extended) const @@ -74,7 +74,7 @@ UniValue CSimplifiedMNListEntry::ToJson(bool extended) const obj.pushKV("nType", ToUnderlying(nType)); obj.pushKV("proRegTxHash", proRegTxHash.ToString()); obj.pushKV("confirmedHash", confirmedHash.ToString()); - obj.pushKV("service", service.ToString(false)); + obj.pushKV("service", service.ToString()); obj.pushKV("pubKeyOperator", pubKeyOperator.ToString()); obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting))); obj.pushKV("isValid", isValid); diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp index d6416f0c2ccb5..b786ff24b0dd8 100644 --- a/src/llmq/utils.cpp +++ b/src/llmq/utils.cpp @@ -795,7 +795,7 @@ bool EnsureQuorumConnections(const Consensus::LLMQParams& llmqParams, CConnman& if (!dmn) { debugMsg += strprintf(" %s (not in valid MN set anymore)\n", c.ToString()); } else { - debugMsg += strprintf(" %s (%s)\n", c.ToString(), dmn->pdmnState->addr.ToString(false)); + debugMsg += strprintf(" %s (%s)\n", c.ToString(), dmn->pdmnState->addr.ToString()); } } LogPrint(BCLog::NET_NETCONN, debugMsg.c_str()); /* Continued */ @@ -842,7 +842,7 @@ void AddQuorumProbeConnections(const Consensus::LLMQParams& llmqParams, CConnman if (!dmn) { debugMsg += strprintf(" %s (not in valid MN set anymore)\n", c.ToString()); } else { - debugMsg += strprintf(" %s (%s)\n", c.ToString(), dmn->pdmnState->addr.ToString(false)); + debugMsg += strprintf(" %s (%s)\n", c.ToString(), dmn->pdmnState->addr.ToString()); } } LogPrint(BCLog::NET_NETCONN, debugMsg.c_str()); /* Continued */ diff --git a/src/net.cpp b/src/net.cpp index 4b560d1ef30f0..919e909a05827 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2774,7 +2774,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman, if (pnode->nTimeFirstMessageReceived != 0 && GetTimeSeconds() - pnode->nTimeFirstMessageReceived > 5) { // clearly not expecting mnauth to take that long even if it wasn't the first message // we received (as it should normally), disconnect - LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- dropping non-mnauth connection to %s, service=%s\n", _func_, proRegTxHash.ToString(), addr2.ToString(false)); + LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- dropping non-mnauth connection to %s, service=%s\n", _func_, proRegTxHash.ToString(), addr2.ToString()); pnode->fDisconnect = true; return true; } @@ -2833,7 +2833,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman, auto dmn = mnList.GetValidMN(vPendingMasternodes.front()); vPendingMasternodes.erase(vPendingMasternodes.begin()); if (dmn && !connectedNodes.count(dmn->pdmnState->addr) && !IsMasternodeOrDisconnectRequested(dmn->pdmnState->addr)) { - LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString(false)); + LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString()); return dmn; } } @@ -2842,7 +2842,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman, // not-null auto dmn = pending[GetRand(pending.size())]; LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening quorum connection to %s, service=%s\n", - _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString(false)); + _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString()); return dmn; } @@ -2852,7 +2852,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman, masternodePendingProbes.erase(dmn->proTxHash); isProbe = MasternodeProbeConn::IsConnection; - LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- probing masternode %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString(false)); + LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- probing masternode %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString()); return dmn; } return nullptr; @@ -2877,7 +2877,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman, return true; }); if (!connected) { - LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- connection failed for masternode %s, service=%s\n", __func__, connectToDmn->proTxHash.ToString(), connectToDmn->pdmnState->addr.ToString(false)); + LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- connection failed for masternode %s, service=%s\n", __func__, connectToDmn->proTxHash.ToString(), connectToDmn->pdmnState->addr.ToString()); // Will take a few consequent failed attempts to PoSe-punish a MN. if (mn_metaman.GetMetaInfo(connectToDmn->proTxHash)->OutboundFailedTooManyTimes()) { LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- failed to connect to masternode %s too many times\n", __func__, connectToDmn->proTxHash.ToString()); @@ -2903,7 +2903,7 @@ void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai auto getIpStr = [&]() { if (fLogIPs) { - return addrConnect.ToString(false); + return addrConnect.ToString(); } else { return std::string("new peer"); } diff --git a/src/netaddress.cpp b/src/netaddress.cpp index eae17d77d2c32..f09fefba7d651 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -606,7 +606,7 @@ static std::string OnionToString(Span addr) return EncodeBase32(address) + ".onion"; } -std::string CNetAddr::ToStringIP(bool fUseGetnameinfo) const +std::string CNetAddr::ToStringIP() const { switch (m_net) { case NET_IPV4: @@ -1027,18 +1027,18 @@ std::string CService::ToStringPort() const return strprintf("%u", port); } -std::string CService::ToStringIPPort(bool fUseGetnameinfo) const +std::string CService::ToStringIPPort() const { if (IsIPv4() || IsTor() || IsI2P() || IsInternal()) { - return ToStringIP(fUseGetnameinfo) + ":" + ToStringPort(); + return ToStringIP() + ":" + ToStringPort(); } else { - return "[" + ToStringIP(fUseGetnameinfo) + "]:" + ToStringPort(); + return "[" + ToStringIP() + "]:" + ToStringPort(); } } -std::string CService::ToString(bool fUseGetnameinfo) const +std::string CService::ToString() const { - return ToStringIPPort(fUseGetnameinfo); + return ToStringIPPort(); } void CService::SetPort(uint16_t portIn) diff --git a/src/netaddress.h b/src/netaddress.h index f50c925158946..7ca6e57304781 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -201,7 +201,7 @@ class CNetAddr enum Network GetNetwork() const; std::string ToString() const; - std::string ToStringIP(bool fUseGetnameinfo = true) const; + std::string ToStringIP() const; uint64_t GetHash() const; bool GetInAddr(struct in_addr* pipv4Addr) const; Network GetNetClass() const; @@ -569,9 +569,9 @@ class CService : public CNetAddr friend bool operator!=(const CService& a, const CService& b) { return !(a == b); } friend bool operator<(const CService& a, const CService& b); std::vector GetKey() const; - std::string ToString(bool fUseGetnameinfo = true) const; + std::string ToString() const; std::string ToStringPort() const; - std::string ToStringIPPort(bool fUseGetnameinfo = true) const; + std::string ToStringIPPort() const; CService(const struct in6_addr& ipv6Addr, uint16_t port); explicit CService(const struct sockaddr_in6& addr); diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp index 9d7bf399c5aca..0b0525aa750f1 100644 --- a/src/rpc/masternode.cpp +++ b/src/rpc/masternode.cpp @@ -654,7 +654,7 @@ static UniValue masternodelist(const JSONRPCRequest& request, ChainstateManager& } if (strMode == "addr") { - std::string strAddress = dmn.pdmnState->addr.ToString(false); + std::string strAddress = dmn.pdmnState->addr.ToString(); if (strFilter !="" && strAddress.find(strFilter) == std::string::npos && strOutpoint.find(strFilter) == std::string::npos) return; obj.pushKV(strOutpoint, strAddress); diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp index f8c1d3359cf8f..020e16bb78cd5 100644 --- a/src/rpc/quorums.cpp +++ b/src/rpc/quorums.cpp @@ -336,7 +336,7 @@ static UniValue quorum_dkgstatus(const JSONRPCRequest& request, CDeterministicMN ecj.pushKV("proTxHash", ec.ToString()); if (foundConnections.count(ec)) { ecj.pushKV("connected", true); - ecj.pushKV("address", foundConnections[ec].ToString(false)); + ecj.pushKV("address", foundConnections[ec].ToString()); } else { ecj.pushKV("connected", false); }