Skip to content

Commit 7b52349

Browse files
vijaydasmpPastaPastaPasta
vijaydasmp
authored and
PastaPastaPasta
committed
Revert "merge dashpay#855: Fix bad mn sig ipv6"
1 parent cd21313 commit 7b52349

File tree

10 files changed

+29
-29
lines changed

10 files changed

+29
-29
lines changed

‎src/evo/deterministicmns.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr& dmn, bool fBumpTota
468468
if (dmn->pdmnState->addr != CService() && !AddUniqueProperty(*dmn, dmn->pdmnState->addr)) {
469469
mnUniquePropertyMap = mnUniquePropertyMapSaved;
470470
throw(std::runtime_error(strprintf("%s: Can't add a masternode %s with a duplicate address=%s", __func__,
471-
dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false))));
471+
dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort())));
472472
}
473473
if (!AddUniqueProperty(*dmn, dmn->pdmnState->keyIDOwner)) {
474474
mnUniquePropertyMap = mnUniquePropertyMapSaved;
@@ -509,7 +509,7 @@ void CDeterministicMNList::UpdateMN(const CDeterministicMN& oldDmn, const std::s
509509
if (!UpdateUniqueProperty(*dmn, oldState->addr, pdmnState->addr)) {
510510
mnUniquePropertyMap = mnUniquePropertyMapSaved;
511511
throw(std::runtime_error(strprintf("%s: Can't update a masternode %s with a duplicate address=%s", __func__,
512-
oldDmn.proTxHash.ToString(), pdmnState->addr.ToStringIPPort(false))));
512+
oldDmn.proTxHash.ToString(), pdmnState->addr.ToStringIPPort())));
513513
}
514514
if (!UpdateUniqueProperty(*dmn, oldState->keyIDOwner, pdmnState->keyIDOwner)) {
515515
mnUniquePropertyMap = mnUniquePropertyMapSaved;
@@ -569,7 +569,7 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
569569
if (dmn->pdmnState->addr != CService() && !DeleteUniqueProperty(*dmn, dmn->pdmnState->addr)) {
570570
mnUniquePropertyMap = mnUniquePropertyMapSaved;
571571
throw(std::runtime_error(strprintf("%s: Can't delete a masternode %s with a address=%s", __func__,
572-
proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false))));
572+
proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort())));
573573
}
574574
if (!DeleteUniqueProperty(*dmn, dmn->pdmnState->keyIDOwner)) {
575575
mnUniquePropertyMap = mnUniquePropertyMapSaved;

‎src/evo/dmnstate.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ std::string CDeterministicMNState::ToString() const
2828
return strprintf("CDeterministicMNState(nVersion=%d, nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, nRevocationReason=%d, "
2929
"ownerAddress=%s, pubKeyOperator=%s, votingAddress=%s, addr=%s, payoutAddress=%s, operatorPayoutAddress=%s)",
3030
nVersion, nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight, nRevocationReason,
31-
EncodeDestination(PKHash(keyIDOwner)), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), addr.ToStringIPPort(false), payoutAddress, operatorPayoutAddress);
31+
EncodeDestination(PKHash(keyIDOwner)), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), addr.ToStringIPPort(), payoutAddress, operatorPayoutAddress);
3232
}
3333

3434
UniValue CDeterministicMNState::ToJson(MnType nType) const
3535
{
3636
UniValue obj;
3737
obj.setObject();
3838
obj.pushKV("version", nVersion);
39-
obj.pushKV("service", addr.ToStringIPPort(false));
39+
obj.pushKV("service", addr.ToStringIPPort());
4040
obj.pushKV("registeredHeight", nRegisteredHeight);
4141
obj.pushKV("lastPaidHeight", nLastPaidHeight);
4242
obj.pushKV("consecutivePayments", nConsecutivePayments);
@@ -71,7 +71,7 @@ UniValue CDeterministicMNStateDiff::ToJson(MnType nType) const
7171
obj.pushKV("version", state.nVersion);
7272
}
7373
if (fields & Field_addr) {
74-
obj.pushKV("service", state.addr.ToStringIPPort(false));
74+
obj.pushKV("service", state.addr.ToStringIPPort());
7575
}
7676
if (fields & Field_nRegisteredHeight) {
7777
obj.pushKV("registeredHeight", state.nRegisteredHeight);

‎src/evo/providertx.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class CProRegTx
9696
obj.pushKV("type", ToUnderlying(nType));
9797
obj.pushKV("collateralHash", collateralOutpoint.hash.ToString());
9898
obj.pushKV("collateralIndex", (int)collateralOutpoint.n);
99-
obj.pushKV("service", addr.ToString(false));
99+
obj.pushKV("service", addr.ToString());
100100
obj.pushKV("ownerAddress", EncodeDestination(PKHash(keyIDOwner)));
101101
obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
102102

@@ -181,7 +181,7 @@ class CProUpServTx
181181
obj.pushKV("version", nVersion);
182182
obj.pushKV("type", ToUnderlying(nType));
183183
obj.pushKV("proTxHash", proTxHash.ToString());
184-
obj.pushKV("service", addr.ToString(false));
184+
obj.pushKV("service", addr.ToString());
185185
if (CTxDestination dest; ExtractDestination(scriptOperatorPayout, dest)) {
186186
obj.pushKV("operatorPayoutAddress", EncodeDestination(dest));
187187
}

‎src/evo/simplifiedmns.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ std::string CSimplifiedMNListEntry::ToString() const
6363
}
6464

6565
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)",
66-
nVersion, ToUnderlying(nType), proRegTxHash.ToString(), confirmedHash.ToString(), service.ToString(false), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), isValid, payoutAddress, operatorPayoutAddress, platformHTTPPort, platformNodeID.ToString());
66+
nVersion, ToUnderlying(nType), proRegTxHash.ToString(), confirmedHash.ToString(), service.ToString(), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), isValid, payoutAddress, operatorPayoutAddress, platformHTTPPort, platformNodeID.ToString());
6767
}
6868

6969
UniValue CSimplifiedMNListEntry::ToJson(bool extended) const
@@ -74,7 +74,7 @@ UniValue CSimplifiedMNListEntry::ToJson(bool extended) const
7474
obj.pushKV("nType", ToUnderlying(nType));
7575
obj.pushKV("proRegTxHash", proRegTxHash.ToString());
7676
obj.pushKV("confirmedHash", confirmedHash.ToString());
77-
obj.pushKV("service", service.ToString(false));
77+
obj.pushKV("service", service.ToString());
7878
obj.pushKV("pubKeyOperator", pubKeyOperator.ToString());
7979
obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
8080
obj.pushKV("isValid", isValid);

‎src/llmq/utils.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ bool EnsureQuorumConnections(const Consensus::LLMQParams& llmqParams, CConnman&
795795
if (!dmn) {
796796
debugMsg += strprintf(" %s (not in valid MN set anymore)\n", c.ToString());
797797
} else {
798-
debugMsg += strprintf(" %s (%s)\n", c.ToString(), dmn->pdmnState->addr.ToString(false));
798+
debugMsg += strprintf(" %s (%s)\n", c.ToString(), dmn->pdmnState->addr.ToString());
799799
}
800800
}
801801
LogPrint(BCLog::NET_NETCONN, debugMsg.c_str()); /* Continued */
@@ -842,7 +842,7 @@ void AddQuorumProbeConnections(const Consensus::LLMQParams& llmqParams, CConnman
842842
if (!dmn) {
843843
debugMsg += strprintf(" %s (not in valid MN set anymore)\n", c.ToString());
844844
} else {
845-
debugMsg += strprintf(" %s (%s)\n", c.ToString(), dmn->pdmnState->addr.ToString(false));
845+
debugMsg += strprintf(" %s (%s)\n", c.ToString(), dmn->pdmnState->addr.ToString());
846846
}
847847
}
848848
LogPrint(BCLog::NET_NETCONN, debugMsg.c_str()); /* Continued */

‎src/net.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2774,7 +2774,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
27742774
if (pnode->nTimeFirstMessageReceived != 0 && GetTimeSeconds() - pnode->nTimeFirstMessageReceived > 5) {
27752775
// clearly not expecting mnauth to take that long even if it wasn't the first message
27762776
// we received (as it should normally), disconnect
2777-
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- dropping non-mnauth connection to %s, service=%s\n", _func_, proRegTxHash.ToString(), addr2.ToString(false));
2777+
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- dropping non-mnauth connection to %s, service=%s\n", _func_, proRegTxHash.ToString(), addr2.ToString());
27782778
pnode->fDisconnect = true;
27792779
return true;
27802780
}
@@ -2833,7 +2833,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
28332833
auto dmn = mnList.GetValidMN(vPendingMasternodes.front());
28342834
vPendingMasternodes.erase(vPendingMasternodes.begin());
28352835
if (dmn && !connectedNodes.count(dmn->pdmnState->addr) && !IsMasternodeOrDisconnectRequested(dmn->pdmnState->addr)) {
2836-
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString(false));
2836+
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString());
28372837
return dmn;
28382838
}
28392839
}
@@ -2842,7 +2842,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
28422842
// not-null
28432843
auto dmn = pending[GetRand(pending.size())];
28442844
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening quorum connection to %s, service=%s\n",
2845-
_func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString(false));
2845+
_func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString());
28462846
return dmn;
28472847
}
28482848

@@ -2852,7 +2852,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
28522852
masternodePendingProbes.erase(dmn->proTxHash);
28532853
isProbe = MasternodeProbeConn::IsConnection;
28542854

2855-
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- probing masternode %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString(false));
2855+
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- probing masternode %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToString());
28562856
return dmn;
28572857
}
28582858
return nullptr;
@@ -2877,7 +2877,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
28772877
return true;
28782878
});
28792879
if (!connected) {
2880-
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- connection failed for masternode %s, service=%s\n", __func__, connectToDmn->proTxHash.ToString(), connectToDmn->pdmnState->addr.ToString(false));
2880+
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- connection failed for masternode %s, service=%s\n", __func__, connectToDmn->proTxHash.ToString(), connectToDmn->pdmnState->addr.ToString());
28812881
// Will take a few consequent failed attempts to PoSe-punish a MN.
28822882
if (mn_metaman.GetMetaInfo(connectToDmn->proTxHash)->OutboundFailedTooManyTimes()) {
28832883
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
29032903

29042904
auto getIpStr = [&]() {
29052905
if (fLogIPs) {
2906-
return addrConnect.ToString(false);
2906+
return addrConnect.ToString();
29072907
} else {
29082908
return std::string("new peer");
29092909
}

‎src/netaddress.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ static std::string OnionToString(Span<const uint8_t> addr)
606606
return EncodeBase32(address) + ".onion";
607607
}
608608

609-
std::string CNetAddr::ToStringIP(bool fUseGetnameinfo) const
609+
std::string CNetAddr::ToStringIP() const
610610
{
611611
switch (m_net) {
612612
case NET_IPV4:
@@ -1027,18 +1027,18 @@ std::string CService::ToStringPort() const
10271027
return strprintf("%u", port);
10281028
}
10291029

1030-
std::string CService::ToStringIPPort(bool fUseGetnameinfo) const
1030+
std::string CService::ToStringIPPort() const
10311031
{
10321032
if (IsIPv4() || IsTor() || IsI2P() || IsInternal()) {
1033-
return ToStringIP(fUseGetnameinfo) + ":" + ToStringPort();
1033+
return ToStringIP() + ":" + ToStringPort();
10341034
} else {
1035-
return "[" + ToStringIP(fUseGetnameinfo) + "]:" + ToStringPort();
1035+
return "[" + ToStringIP() + "]:" + ToStringPort();
10361036
}
10371037
}
10381038

1039-
std::string CService::ToString(bool fUseGetnameinfo) const
1039+
std::string CService::ToString() const
10401040
{
1041-
return ToStringIPPort(fUseGetnameinfo);
1041+
return ToStringIPPort();
10421042
}
10431043

10441044
void CService::SetPort(uint16_t portIn)

‎src/netaddress.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class CNetAddr
201201

202202
enum Network GetNetwork() const;
203203
std::string ToString() const;
204-
std::string ToStringIP(bool fUseGetnameinfo = true) const;
204+
std::string ToStringIP() const;
205205
uint64_t GetHash() const;
206206
bool GetInAddr(struct in_addr* pipv4Addr) const;
207207
Network GetNetClass() const;
@@ -569,9 +569,9 @@ class CService : public CNetAddr
569569
friend bool operator!=(const CService& a, const CService& b) { return !(a == b); }
570570
friend bool operator<(const CService& a, const CService& b);
571571
std::vector<unsigned char> GetKey() const;
572-
std::string ToString(bool fUseGetnameinfo = true) const;
572+
std::string ToString() const;
573573
std::string ToStringPort() const;
574-
std::string ToStringIPPort(bool fUseGetnameinfo = true) const;
574+
std::string ToStringIPPort() const;
575575

576576
CService(const struct in6_addr& ipv6Addr, uint16_t port);
577577
explicit CService(const struct sockaddr_in6& addr);

‎src/rpc/masternode.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ static UniValue masternodelist(const JSONRPCRequest& request, ChainstateManager&
654654
}
655655

656656
if (strMode == "addr") {
657-
std::string strAddress = dmn.pdmnState->addr.ToString(false);
657+
std::string strAddress = dmn.pdmnState->addr.ToString();
658658
if (strFilter !="" && strAddress.find(strFilter) == std::string::npos &&
659659
strOutpoint.find(strFilter) == std::string::npos) return;
660660
obj.pushKV(strOutpoint, strAddress);

‎src/rpc/quorums.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ static UniValue quorum_dkgstatus(const JSONRPCRequest& request, CDeterministicMN
336336
ecj.pushKV("proTxHash", ec.ToString());
337337
if (foundConnections.count(ec)) {
338338
ecj.pushKV("connected", true);
339-
ecj.pushKV("address", foundConnections[ec].ToString(false));
339+
ecj.pushKV("address", foundConnections[ec].ToString());
340340
} else {
341341
ecj.pushKV("connected", false);
342342
}

0 commit comments

Comments
 (0)