rpc: make setting platform{HTTP,P2P}Port optional if using netInfo

Author: kwvg

src/rpc/evo.cpp

@@ -184,11 +184,21 @@ static RPCArg GetRpcArg(const std::string& strParamName)
                 "Platform P2P node ID, derived from P2P public key."}
         },
         {"platformP2PPort",
+            {"platformP2PPort", RPCArg::Type::STR, RPCArg::Optional::NO,
+                "Address in the form \"ADDR:PORT\" used by Platform for peer-to-peer connection.\n"
+                "Must be unique on the network. Can be set to an empty string, which will require a ProUpServTx afterwards."}
+        },
+        {"platformP2PPort_update",
             {"platformP2PPort", RPCArg::Type::STR, RPCArg::Optional::NO,
                 "Address in the form \"ADDR:PORT\" used by Platform for peer-to-peer connection.\n"
                 "Must be unique on the network."}
         },
         {"platformHTTPPort",
+            {"platformHTTPPort", RPCArg::Type::STR, RPCArg::Optional::NO,
+                "Address in the form \"ADDR:PORT\" used by Platform for their HTTPS API.\n"
+                "Must be unique on the network. Can be set to an empty string, which will require a ProUpServTx afterwards."}
+        },
+        {"platformHTTPPort_update",
             {"platformHTTPPort", RPCArg::Type::STR, RPCArg::Optional::NO,
                 "Address in the form \"ADDR:PORT\" used by Platform for their HTTPS API.\n"
                 "Must be unique on the network."}
@@ -736,7 +746,7 @@ static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
         }
         ptx.platformNodeID.SetHex(request.params[paramIdx + 6].get_str());
 
-        ProcessNetInfoPlatform(ptx, request.params[paramIdx + 7], request.params[paramIdx + 8]);
+        ProcessNetInfoPlatform(ptx, request.params[paramIdx + 7], request.params[paramIdx + 8], /*optional=*/true);
 
         paramIdx += 3;
     }
@@ -944,8 +954,8 @@ static RPCHelpMan protx_update_service_evo()
             GetRpcArg("coreP2PAddrs_update"),
             GetRpcArg("operatorKey"),
             GetRpcArg("platformNodeID"),
-            GetRpcArg("platformP2PPort"),
-            GetRpcArg("platformHTTPPort"),
+            GetRpcArg("platformP2PPort_update"),
+            GetRpcArg("platformHTTPPort_update"),
             GetRpcArg("operatorPayoutAddress"),
             GetRpcArg("feeSourceAddress"),
             GetRpcArg("submit"),
@@ -1006,7 +1016,7 @@ static UniValue protx_update_service_common_wrapper(const JSONRPCRequest& reques
         }
         ptx.platformNodeID.SetHex(request.params[paramIdx].get_str());
 
-        ProcessNetInfoPlatform(ptx, request.params[paramIdx + 1], request.params[paramIdx + 2]);
+        ProcessNetInfoPlatform(ptx, request.params[paramIdx + 1], request.params[paramIdx + 2], /*optional=*/false);
 
         paramIdx += 3;
     }

src/rpc/evo_util.cpp

@@ -63,7 +63,7 @@ template void ProcessNetInfoCore(CProRegTx& ptx, const UniValue& input, const bo
 template void ProcessNetInfoCore(CProUpServTx& ptx, const UniValue& input, const bool optional);
 
 template <typename ProTx>
-void ProcessNetInfoPlatform(ProTx& ptx, const UniValue& input_p2p, const UniValue& input_http)
+void ProcessNetInfoPlatform(ProTx& ptx, const UniValue& input_p2p, const UniValue& input_http, const bool optional)
 {
     CHECK_NONFATAL(ptx.netInfo);
 
@@ -75,7 +75,23 @@ void ProcessNetInfoPlatform(ProTx& ptx, const UniValue& input_p2p, const UniValu
         }
 
         const auto& input_str{input.getValStr()};
-        if (!IsNumeric(input_str)) {
+        if (input_str.empty()) {
+            if (!optional) {
+                // Mandatory field, cannot specify blank value
+                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid param for %s, cannot be empty", field_name));
+            }
+            if (!ptx.netInfo->CanStorePlatform()) {
+                // We can tolerate blank values if netInfo can store platform fields, if it cannot, we are relying
+                // on platform{HTTP,P2P}Port, where it is mandatory even if their netInfo counterpart is optional.
+                throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                   strprintf("Invalid param for %s, ProTx version only supports ports", field_name));
+            }
+            if (!ptx.netInfo->IsEmpty()) {
+                // Blank values are tolerable so long as no other field has been populated.
+                throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                   strprintf("Invalid param for %s, cannot be empty if other fields populated", field_name));
+            }
+        } else if (!IsNumeric(input_str)) {
             // Cannot be parsed as a number (port) so must be an addr:port string
             if (!ptx.netInfo->CanStorePlatform()) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER,

src/rpc/evo_util.h

@@ -13,6 +13,6 @@ void ProcessNetInfoCore(ProTx& ptx, const UniValue& input, const bool optional);
 
 /** Process setting (legacy) Platform network information fields based on ProTx version */
 template <typename ProTx>
-void ProcessNetInfoPlatform(ProTx& ptx, const UniValue& input_p2p, const UniValue& input_http);
+void ProcessNetInfoPlatform(ProTx& ptx, const UniValue& input_p2p, const UniValue& input_http, const bool optional);
 
 #endif // BITCOIN_RPC_EVO_UTIL_H