Do not try to register a deferred masternode.

When startmasternode is called with defer set to true, do not even
attempt to register the masternode; just create the broadcast data
and return it.

This makes it possible to use the function even when the masternode
is not yet valid, e.g. because the collateral does not have sufficient
confirmations yet.

Author: domob1812

divi/src/rpcmasternode.cpp

@@ -505,57 +505,55 @@ Value startmasternode(const Array& params, bool fHelp)
             "\nResult:\n"
             "\"status\"	(string) status of masternode\n");
 
-    std::string alias = params[0].get_str();
-    bool deferRelay = (params.size() == 1)? false: params[1].get_bool();
+    const std::string alias = params[0].get_str();
+    const bool deferRelay = (params.size() == 1)? false: params[1].get_bool();
 
     EnsureWalletIsUnlocked();
 
-    Object result;
-    bool fFound = false;
     for(const auto& configEntry : masternodeConfig.getEntries())
     {
-        if(configEntry.getAlias() == alias)
+        if(configEntry.getAlias() != alias)
+            continue;
+
+        Object result;
+        std::string strError;
+        CMasternodeBroadcast mnb;
+
+        if(!CMasternodeBroadcastFactory::Create(
+                configEntry,
+                strError,
+                mnb,
+                false,
+                deferRelay))
         {
-            fFound = true;
-            std::string strError;
-            CMasternodeBroadcast mnb;
-
-            if(!CMasternodeBroadcastFactory::Create(
-                    configEntry,
-                    strError,
-                    mnb,
-                    false,
-                    deferRelay))
-            {
-                break;
-            }
+            result.push_back(Pair("status", "failed"));
+            result.push_back(Pair("error", strError));
+            return result;
+        }
 
-            if(CActiveMasternode::Register(mnb, deferRelay))
-            {
-                result.push_back(Pair("status", "success"));
-                if(deferRelay)
-                {
-                    CDataStream ss(SER_NETWORK,PROTOCOL_VERSION);
-                    ss << mnb;
-                    result.push_back(Pair("broadcastData", HexStr(ss.str()) ));
-                }
-                fFound = true;
-            }
+        if (deferRelay)
+        {
+            CDataStream ss(SER_NETWORK,PROTOCOL_VERSION);
+            ss << mnb;
 
-            if(!fFound)
-            {
-                result.push_back(Pair("status", "failed"));
-                result.push_back(Pair("error", strError));
-            }
+            result.push_back(Pair("status", "success"));
+            result.push_back(Pair("broadcastData", HexStr(ss.str())));
 
-            break;
+            return result;
         }
-    }
 
-    if(!fFound)
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid alias, couldn't find MN. Check your masternode.conf file");
+        if(!CActiveMasternode::Register(mnb, deferRelay))
+        {
+            result.push_back(Pair("status", "failed"));
+            result.push_back(Pair("error", strError));
+            return result;
+        }
 
-    return result;
+        result.push_back(Pair("status", "success"));
+        return result;
+    }
+
+    throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid alias, couldn't find MN. Check your masternode.conf file");
 }
 
 Value createmasternodekey(const Array& params, bool fHelp)