WIP: configure address with setupmasternode

Author: domob1812

divi/src/MasternodeBroadcastFactory.cpp

@@ -94,16 +94,10 @@ bool createArgumentsFromConfig(
         return false;
     }
 
-    if (configEntry.getRewardAddress().empty())
-        rewardScript = CMasternode::GetDefaultRewardScript(pubkeyCollateralAddress);
-    else {
-        const CBitcoinAddress addr(configEntry.getRewardAddress());
-        if (!addr.IsValid()) {
-            strErrorRet = strprintf("Invalid reward address for masternode: %s", configEntry.getRewardAddress());
-            return false;
-        }
-        rewardScript = GetScriptForDestination(addr.Get());
-    }
+    /* If a custom reward address should be used, this is overridden by
+       setupmasternode directly after creating the entry (not loaded through
+       the config file).  */
+    rewardScript = CMasternode::GetDefaultRewardScript(pubkeyCollateralAddress);
 
     return true;
 }

divi/src/masternodeconfig.cpp

@@ -41,10 +41,9 @@ boost::filesystem::path GetMasternodeConfigFile(const Settings& settings)
 } // anonymous namespace
 
 void CMasternodeConfig::add(const std::string& alias, const std::string& ip, const std::string& privKey,
-                            const std::string& txHash, const std::string& outputIndex,
-                            const std::string& rewardAddr)
+                            const std::string& txHash, const std::string& outputIndex)
 {
-    entries.emplace_back(alias, ip, privKey, txHash, outputIndex, rewardAddr);
+    entries.emplace_back(alias, ip, privKey, txHash, outputIndex);
 }
 
 bool CMasternodeConfig::read(const Settings& settings, std::string& strErr)
@@ -88,12 +87,7 @@ bool CMasternodeConfig::read(const Settings& settings, std::string& strErr)
             }
         }
 
-        /* This might fail if there is no address, but that is fine and we will
-           just leave the string empty in that case.  */
-        std::string rewardAddr;
-        iss >> rewardAddr;
-
-        add(alias, ip, privKey, txHash, outputIndex, rewardAddr);
+        add(alias, ip, privKey, txHash, outputIndex);
     }
 
     streamConfig.close();

divi/src/masternodeconfig.h

@@ -26,20 +26,17 @@ class CMasternodeConfig
         std::string privKey;
         std::string txHash;
         std::string outputIndex;
-        std::string rewardAddress;
 
     public:
         CMasternodeEntry(const std::string& alias, const std::string& ip,
                          const std::string& privKey,
-                         const std::string& txHash, const std::string& outputIndex,
-                         const std::string& rewardAddress)
+                         const std::string& txHash, const std::string& outputIndex)
         {
             this->alias = alias;
             this->ip = ip;
             this->privKey = privKey;
             this->txHash = txHash;
             this->outputIndex = outputIndex;
-            this->rewardAddress = rewardAddress;
         }
 
         const std::string& getAlias() const
@@ -92,16 +89,6 @@ class CMasternodeConfig
             this->ip = ip;
         }
 
-        const std::string& getRewardAddress() const
-        {
-            return rewardAddress;
-        }
-
-        void setRewardAddress(const std::string& addr)
-        {
-            this->rewardAddress = addr;
-        }
-
         /** Tries to parse the entry's input reference into an outpoint.
          *  Returns true on success.  */
         bool parseInputReference(COutPoint& outp) const;
@@ -112,8 +99,7 @@ class CMasternodeConfig
     void clear();
     bool read(const Settings& settings, std::string& strErr);
     void add(const std::string& alias, const std::string& ip, const std::string& privKey,
-             const std::string& txHash, const std::string& outputIndex,
-             const std::string& rewardAddr);
+             const std::string& txHash, const std::string& outputIndex);
     const std::vector<CMasternodeEntry>& getEntries() const;
     int getCount() const;
 

divi/src/rpcmasternode.cpp

@@ -263,9 +263,9 @@ Value signmnbroadcast(const Array& params, bool fHelp)
 
 Value setupmasternode(const Array& params, bool fHelp)
 {
-	if (fHelp || params.size() < 5 || params.size() > 6)
+	if (fHelp || params.size() < 5 || params.size() > 7)
 		throw std::runtime_error(
-			"setupmasternode alias txhash outputIndex collateralPubKey ip_address\n"
+			"setupmasternode alias txhash outputIndex collateralPubKey ip_address (reward_address)\n"
 			"\nStarts escrows funds for some purpose.\n"
 
 			"\nArguments:\n"
@@ -274,6 +274,7 @@ Value setupmasternode(const Array& params, bool fHelp)
             "3. outputIndex         (string, required) Output index transaction. \n"
             "4. collateralPubkey    (string, required) collateral pubkey. \n"
             "5. ip_address          (string, required) Local ip address of this node\n"
+            "6. reward_address      (string, optional) A custom reward address, defaults to the collateral address\n"
 			"\nResult:\n"
 			"\"protocol_version\"			(string) Protocol version used for serialization.\n"
             "\"message_to_sign\"			(string) Hex-encoded msg requiring collateral signature.\n"
@@ -307,7 +308,7 @@ Value setupmasternode(const Array& params, bool fHelp)
     if (ipAndPort.find(':') == std::string::npos)
         ipAndPort += ":" + std::to_string(Params().GetDefaultPort());
 
-    CMasternodeConfig::CMasternodeEntry config(alias,ipAndPort,"",txHash,outputIndex,"");
+    CMasternodeConfig::CMasternodeEntry config(alias,ipAndPort,"",txHash,outputIndex);
 
     CMasternodeBroadcast mnb;
     std::string errorMsg;
@@ -316,6 +317,17 @@ Value setupmasternode(const Array& params, bool fHelp)
         throw JSONRPCError(RPC_INVALID_PARAMS,errorMsg);
     }
 
+    /* If we have a custom reward address, override the one from the broadcast.
+       This is fine, as it would only invalidate the broadcast signature and
+       the broadcast created is not yet signed anyway.  */
+    if (params.size() >= 6 && !params[5].get_str().empty())
+    {
+        const CBitcoinAddress addr(params[5].get_str());
+        if (!addr.IsValid())
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid reward address");
+        mnb.rewardScript = GetScriptForDestination(addr.Get());
+    }
+
     CDataStream ss(SER_NETWORK,PROTOCOL_VERSION);
     result.push_back(Pair("protocol_version", PROTOCOL_VERSION ));
     result.push_back(Pair("message_to_sign", HexStr(mnb.getMessageToSign()) ));

divi/src/test/ActiveMasternode_tests.cpp

@@ -30,7 +30,7 @@ class ActiveMasternodeTestFixture
 
     void AddDummyConfiguration(CTxIn txIn, CService service)
     {
-        configurations_->add("dummy configuration", service.ToString(), "", txIn.prevout.hash.ToString(), std::to_string(txIn.prevout.n), "");
+        configurations_->add("dummy configuration", service.ToString(), "", txIn.prevout.hash.ToString(), std::to_string(txIn.prevout.n));
     }
     void disableMasternode()
     {