rpc: allow platform{P2P,HTTP}Port to return port of first address

This is to ensure that even when the fields have been deprecated, they
can still return values by reading from `netInfo`. This will require us
to constrain ExtNetInfo's validation rules to continue under legacy
assumptions *until* we remove the legacy reporting fields altogether.

Author: kwvg

src/evo/core_write.cpp

@@ -85,8 +85,8 @@
     ret.pushKV("operatorReward", (double)nOperatorReward / 100);
     if (nType == MnType::Evo) {
         ret.pushKV("platformNodeID", platformNodeID.ToString());
-        ret.pushKV("platformP2PPort", platformP2PPort);
-        ret.pushKV("platformHTTPPort", platformHTTPPort);
+        ret.pushKV("platformP2PPort", GetPlatformPort</*is_p2p=*/true>(*this));
+        ret.pushKV("platformHTTPPort", GetPlatformPort</*is_p2p=*/false>(*this));
     }
     ret.pushKV("inputsHash", inputsHash.ToString());
     return ret;
@@ -131,8 +131,8 @@
     }
     if (nType == MnType::Evo) {
         ret.pushKV("platformNodeID", platformNodeID.ToString());
-        ret.pushKV("platformP2PPort", platformP2PPort);
-        ret.pushKV("platformHTTPPort", platformHTTPPort);
+        ret.pushKV("platformP2PPort", GetPlatformPort</*is_p2p=*/true>(*this));
+        ret.pushKV("platformHTTPPort", GetPlatformPort</*is_p2p=*/false>(*this));
     }
     ret.pushKV("inputsHash", inputsHash.ToString());
     return ret;
@@ -170,7 +170,7 @@
     obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
     obj.pushKV("isValid", isValid);
     if (nType == MnType::Evo) {
-        obj.pushKV("platformHTTPPort", platformHTTPPort);
+        obj.pushKV("platformHTTPPort", GetPlatformPort</*is_p2p=*/false>(*this));
         obj.pushKV("platformNodeID", platformNodeID.ToString());
     }
 

src/evo/dmnstate.cpp

@@ -51,8 +51,8 @@ UniValue CDeterministicMNState::ToJson(MnType nType) const
     obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
     if (nType == MnType::Evo) {
         obj.pushKV("platformNodeID", platformNodeID.ToString());
-        obj.pushKV("platformP2PPort", platformP2PPort);
-        obj.pushKV("platformHTTPPort", platformHTTPPort);
+        obj.pushKV("platformP2PPort", GetPlatformPort</*is_p2p=*/true>(*this));
+        obj.pushKV("platformHTTPPort", GetPlatformPort</*is_p2p=*/false>(*this));
     }
 
     CTxDestination dest;

src/evo/netinfo.cpp

@@ -218,15 +218,15 @@ NetInfoStatus MnNetInfo::AddEntry(const NetInfoPurpose purpose, const std::strin
     return NetInfoStatus::BadInput;
 }
 
-NetInfoList MnNetInfo::GetEntries() const
+NetInfoList MnNetInfo::GetEntries(std::optional<NetInfoPurpose> purpose_opt) const
 {
-    if (!IsEmpty()) {
+    if (!IsEmpty() && (!purpose_opt || *purpose_opt == NetInfoPurpose::CORE_P2P)) {
         ASSERT_IF_DEBUG(m_addr.GetAddrPort().has_value());
         return {m_addr};
     }
-    // If MnNetInfo is empty, we probably don't expect any entries to show up, so
-    // we return a blank set instead.
-    return {};
+    // If MnNetInfo is empty or we are given an unexpected purpose code, we don't
+    // expect any entries to show up, so we return a blank set instead.
+    return NetInfoList{};
 }
 
 CService MnNetInfo::GetPrimary() const
@@ -370,11 +370,17 @@ NetInfoStatus ExtNetInfo::AddEntry(const NetInfoPurpose purpose, const std::stri
     return NetInfoStatus::BadInput; /* Lookup() failed */
 }
 
-NetInfoList ExtNetInfo::GetEntries() const
+NetInfoList ExtNetInfo::GetEntries(std::optional<NetInfoPurpose> purpose_opt) const
 {
-    // ExtNetInfo is an append-only structure, we can avoid re-calculating
-    // a list of all entries by maintaining a small cache.
-    return m_all_entries;
+    if (!purpose_opt) {
+        // Without a purpose code specified, we're being requested for a flattened list of all
+        // entries. ExtNetInfo is an append-only structure, so we can avoid re-calculating a
+        // list of all entries by maintaining a small cache.
+        return m_all_entries;
+    }
+    if (!IsValidPurpose(*purpose_opt)) return NetInfoList{};
+    const auto& it{m_data.find(*purpose_opt)};
+    return it != m_data.end() ? it->second : NetInfoList{};
 }
 
 CService ExtNetInfo::GetPrimary() const

src/evo/netinfo.h

@@ -193,7 +193,7 @@ class NetInfoInterface
     virtual ~NetInfoInterface() = default;
 
     virtual NetInfoStatus AddEntry(const NetInfoPurpose purpose, const std::string& service) = 0;
-    virtual NetInfoList GetEntries() const = 0;
+    virtual NetInfoList GetEntries(std::optional<NetInfoPurpose> purpose_opt = std::nullopt) const = 0;
 
     virtual CService GetPrimary() const = 0;
     virtual bool CanStorePlatform() const = 0;
@@ -251,7 +251,7 @@ class MnNetInfo final : public NetInfoInterface
     }
 
     NetInfoStatus AddEntry(const NetInfoPurpose purpose, const std::string& service) override;
-    NetInfoList GetEntries() const override;
+    NetInfoList GetEntries(std::optional<NetInfoPurpose> purpose_opt = std::nullopt) const override;
 
     CService GetPrimary() const override;
     bool HasEntries(NetInfoPurpose purpose) const override { return purpose == NetInfoPurpose::CORE_P2P && !IsEmpty(); }
@@ -339,7 +339,7 @@ class ExtNetInfo final : public NetInfoInterface
     }
 
     NetInfoStatus AddEntry(const NetInfoPurpose purpose, const std::string& input) override;
-    NetInfoList GetEntries() const override;
+    NetInfoList GetEntries(std::optional<NetInfoPurpose> purpose_opt = std::nullopt) const override;
 
     CService GetPrimary() const override;
     bool HasEntries(NetInfoPurpose purpose) const override;

src/rpc/evo_util.h

@@ -49,4 +49,40 @@ UniValue GetNetInfoWithLegacyFields(const Obj& obj, const MnType& type)
     return ret;
 }
 
+/** Returns platform port based on purpose and network info version */
+template <bool is_p2p, typename Obj>
+int32_t GetPlatformPort(const Obj& obj)
+{
+    // Currently, there is nothing that prevents PLATFORM_{HTTPS,P2P} to be registered to
+    // an addr *different* from the primary addr for CORE_P2P. This breaks the assumptions
+    // under which platform{HTTP,P2P}Port operate under (i.e. all three are hosted with the
+    // same addr).
+    //
+    // TODO: Introduce restrictions that enforce this assumption *until* we remove legacy
+    //       fields for good.
+    //
+    bool is_legacy{!(CHECK_NONFATAL(obj.netInfo)->CanStorePlatform())};
+    if constexpr (is_p2p) {
+        static_assert(!std::is_same_v<std::decay_t<Obj>, CSimplifiedMNListEntry>,
+                      "CSimplifiedMNListEntry doesn't have platformP2PPort");
+        if (is_legacy) {
+            return obj.platformP2PPort;
+        }
+        if (obj.netInfo->IsEmpty()) {
+            return -1; // Blank entry, nothing to report
+        }
+        CHECK_NONFATAL(obj.netInfo->HasEntries(NetInfoPurpose::PLATFORM_P2P));
+        return obj.netInfo->GetEntries(NetInfoPurpose::PLATFORM_P2P)[0].GetPort();
+    } else {
+        if (is_legacy) {
+            return obj.platformHTTPPort;
+        }
+        if (obj.netInfo->IsEmpty()) {
+            return -1; // Blank entry, nothing to report
+        }
+        CHECK_NONFATAL(obj.netInfo->HasEntries(NetInfoPurpose::PLATFORM_HTTPS));
+        return obj.netInfo->GetEntries(NetInfoPurpose::PLATFORM_HTTPS)[0].GetPort();
+    }
+}
+
 #endif // BITCOIN_RPC_EVO_UTIL_H

src/rpc/masternode.cpp

@@ -6,16 +6,16 @@
 #include <evo/assetlocktx.h>
 #include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
-#include <index/txindex.h>
-#include <node/blockstorage.h>
-#include <node/context.h>
 #include <governance/governance.h>
+#include <index/txindex.h>
 #include <masternode/node.h>
 #include <masternode/payments.h>
 #include <net.h>
 #include <netbase.h>
-#include <rpc/server.h>
+#include <node/blockstorage.h>
+#include <node/context.h>
 #include <rpc/evo_util.h>
+#include <rpc/server.h>
 #include <rpc/server_util.h>
 #include <rpc/util.h>
 #include <univalue.h>
@@ -623,8 +623,8 @@ static RPCHelpMan masternodelist_helper(bool is_composite)
             objMN.pushKV("type", std::string(GetMnType(dmn.nType).description));
             if (dmn.nType == MnType::Evo) {
                 objMN.pushKV("platformNodeID", dmn.pdmnState->platformNodeID.ToString());
-                objMN.pushKV("platformP2PPort", dmn.pdmnState->platformP2PPort);
-                objMN.pushKV("platformHTTPPort", dmn.pdmnState->platformHTTPPort);
+                objMN.pushKV("platformP2PPort", GetPlatformPort</*is_p2p=*/true>(*dmn.pdmnState));
+                objMN.pushKV("platformHTTPPort", GetPlatformPort</*is_p2p=*/false>(*dmn.pdmnState));
             }
             objMN.pushKV("pospenaltyscore", dmn.pdmnState->nPoSePenalty);
             objMN.pushKV("consecutivePayments", dmn.pdmnState->nConsecutivePayments);