Allow configuration of reward address.

Allow setting a non-default reward script for masternodes, by editing
the masternode.conf file explicitly.  The RPC setupmasternode will not
generate such configuration lines for now, and also "old" masternode.conf
files will remain valid (with the default script).

Author: domob1812

divi/src/MasternodeBroadcastFactory.cpp

@@ -8,6 +8,7 @@
 #include <wallet.h>
 #include <chain.h>
 #include <base58address.h>
+#include <script/standard.h>
 #include <TransactionDiskAccessor.h>
 #include <timedata.h>
 #include <WalletTx.h>
@@ -105,6 +106,7 @@ bool createArgumentsFromConfig(
     bool collateralPrivKeyIsRemote,
     CTxIn& txin,
     std::pair<CKey,CPubKey>& masternodeKeyPair,
+    CScript& rewardScript,
     std::pair<CKey,CPubKey>& masternodeCollateralKeyPair,
     MasternodeTier& nMasternodeTier
     )
@@ -121,6 +123,18 @@ bool createArgumentsFromConfig(
     {
         return false;
     }
+
+    if (configEntry.getRewardAddress().empty())
+        rewardScript = CMasternode::GetDefaultRewardScript(masternodeCollateralKeyPair.second);
+    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());
+    }
+
     return true;
 }
 
@@ -137,6 +151,7 @@ bool CMasternodeBroadcastFactory::Create(
     const bool deferRelay = true;
     CTxIn txin;
     std::pair<CKey,CPubKey> masternodeCollateralKeyPair;
+    CScript rewardScript;
     std::pair<CKey,CPubKey> masternodeKeyPair;
     MasternodeTier nMasternodeTier;
 
@@ -147,6 +162,7 @@ bool CMasternodeBroadcastFactory::Create(
         collateralPrivateKeyIsRemote,
         txin,
         masternodeKeyPair,
+        rewardScript,
         masternodeCollateralKeyPair,
         nMasternodeTier))
     {
@@ -157,6 +173,7 @@ bool CMasternodeBroadcastFactory::Create(
         txin,
         CService(configEntry.getIp()),
         pubkeyCollateralAddress,
+        rewardScript,
         masternodeKeyPair.second,
         nMasternodeTier,
         deferRelay,
@@ -185,6 +202,7 @@ bool CMasternodeBroadcastFactory::Create(
 
     CTxIn txin;
     std::pair<CKey,CPubKey> masternodeCollateralKeyPair;
+    CScript rewardScript;
     std::pair<CKey,CPubKey> masternodeKeyPair;
     MasternodeTier nMasternodeTier;
 
@@ -195,6 +213,7 @@ bool CMasternodeBroadcastFactory::Create(
         collateralPrivateKeyIsRemote,
         txin,
         masternodeKeyPair,
+        rewardScript,
         masternodeCollateralKeyPair,
         nMasternodeTier))
     {
@@ -205,6 +224,7 @@ bool CMasternodeBroadcastFactory::Create(
                 CService(strService),
                 masternodeCollateralKeyPair.first,
                 masternodeCollateralKeyPair.second,
+                rewardScript,
                 masternodeKeyPair.first,
                 masternodeKeyPair.second,
                 nMasternodeTier,
@@ -286,6 +306,7 @@ void CMasternodeBroadcastFactory::createWithoutSignatures(
     const CTxIn& txin,
     const CService& service,
     const CPubKey& pubKeyCollateralAddressNew,
+    const CScript& rewardScript,
     const CPubKey& pubKeyMasternodeNew,
     const MasternodeTier nMasternodeTier,
     bool deferRelay,
@@ -295,7 +316,9 @@ void CMasternodeBroadcastFactory::createWithoutSignatures(
              CBitcoinAddress(pubKeyCollateralAddressNew.GetID()).ToString(),
              pubKeyMasternodeNew.GetID().ToString());
 
-    mnbRet = CMasternodeBroadcast(service, txin, pubKeyCollateralAddressNew, pubKeyMasternodeNew, nMasternodeTier, PROTOCOL_VERSION);
+    mnbRet = CMasternodeBroadcast(service, txin,
+                                  pubKeyCollateralAddressNew, rewardScript, pubKeyMasternodeNew,
+                                  nMasternodeTier, PROTOCOL_VERSION);
     const CMasternodePing mnp = (deferRelay
                                     ? createDelayedMasternodePing(mnbRet)
                                     : createCurrentPing(txin));
@@ -308,6 +331,7 @@ bool CMasternodeBroadcastFactory::Create(
     const CService& service,
     const CKey& keyCollateralAddressNew,
     const CPubKey& pubKeyCollateralAddressNew,
+    const CScript& rewardScript,
     const CKey& keyMasternodeNew,
     const CPubKey& pubKeyMasternodeNew,
     const MasternodeTier nMasternodeTier,
@@ -319,7 +343,7 @@ bool CMasternodeBroadcastFactory::Create(
     if (fImporting || fReindex) return false;
 
     createWithoutSignatures(
-        txin,service,pubKeyCollateralAddressNew,pubKeyMasternodeNew,nMasternodeTier,deferRelay,mnbRet);
+        txin,service,pubKeyCollateralAddressNew,rewardScript,pubKeyMasternodeNew,nMasternodeTier,deferRelay,mnbRet);
 
     if(!provideSignatures(keyMasternodeNew,pubKeyMasternodeNew,keyCollateralAddressNew,mnbRet,strErrorRet))
     {

divi/src/MasternodeBroadcastFactory.h

@@ -40,6 +40,7 @@ class CMasternodeBroadcastFactory
         const CTxIn& txin,
         const CService& service,
         const CPubKey& pubKeyCollateralAddressNew,
+        const CScript& rewardScript,
         const CPubKey& pubKeyMasternodeNew,
         MasternodeTier nMasternodeTier,
         bool deferRelay,
@@ -61,6 +62,7 @@ class CMasternodeBroadcastFactory
                        const CService& service,
                        const CKey& keyCollateralAddressNew,
                        const CPubKey& pubKeyCollateralAddressNew,
+                       const CScript& rewardScript,
                        const CKey& keyMasternodeNew,
                        const CPubKey& pubKeyMasternodeNew,
                        MasternodeTier nMasternodeTier,

divi/src/masternode.cpp

@@ -273,13 +273,13 @@ bool CMasternode::IsValidNetAddr() const
 
 CMasternodeBroadcast::CMasternodeBroadcast(
     const CService& newAddr, const CTxIn& newVin,
-    const CPubKey& pubKeyCollateralAddressNew, const CPubKey& pubKeyMasternodeNew,
+    const CPubKey& pubKeyCollateralAddressNew, const CScript& rewardScriptIn, const CPubKey& pubKeyMasternodeNew,
     const MasternodeTier nMasternodeTier, const int protocolVersionIn)
 {
     vin = newVin;
     addr = newAddr;
     pubKeyCollateralAddress = pubKeyCollateralAddressNew;
-    rewardScript = GetDefaultRewardScript();
+    rewardScript = rewardScriptIn;
     pubKeyMasternode = pubKeyMasternodeNew;
     protocolVersion = protocolVersionIn;
     nTier = nMasternodeTier;

divi/src/masternode.h

@@ -162,6 +162,7 @@ class CMasternodeBroadcast : public CMasternode
         const CService& newAddr,
         const CTxIn& newVin,
         const CPubKey& pubKeyCollateralAddress,
+        const CScript& rewardScriptIn,
         const CPubKey& pubKeyMasternode,
         MasternodeTier nMasternodeTier,
         int protocolVersionIn);

divi/src/masternodeconfig.cpp

@@ -25,9 +25,10 @@ boost::filesystem::path GetMasternodeConfigFile()
 }
 
 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& txHash, const std::string& outputIndex,
+                            const std::string& rewardAddr)
 {
-    entries.emplace_back(alias, ip, privKey, txHash, outputIndex);
+    entries.emplace_back(alias, ip, privKey, txHash, outputIndex, rewardAddr);
 }
 
 bool CMasternodeConfig::read(std::string& strErr)
@@ -71,7 +72,12 @@ bool CMasternodeConfig::read(std::string& strErr)
             }
         }
 
-        add(alias, ip, privKey, txHash, outputIndex);
+        /* 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);
     }
 
     streamConfig.close();

divi/src/masternodeconfig.h

@@ -23,17 +23,20 @@ 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& txHash, const std::string& outputIndex,
+                         const std::string& rewardAddress)
         {
             this->alias = alias;
             this->ip = ip;
             this->privKey = privKey;
             this->txHash = txHash;
             this->outputIndex = outputIndex;
+            this->rewardAddress = rewardAddress;
         }
 
         const std::string& getAlias() const
@@ -87,14 +90,25 @@ class CMasternodeConfig
         {
             this->ip = ip;
         }
+
+        const std::string& getRewardAddress() const
+        {
+            return rewardAddress;
+        }
+
+        void setRewardAddress(const std::string& addr)
+        {
+            this->rewardAddress = addr;
+        }
     };
 
     CMasternodeConfig();
 
     void clear();
     bool read(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& txHash, const std::string& outputIndex,
+             const std::string& rewardAddr);
     const std::vector<CMasternodeEntry>& getEntries() const;
     int getCount() const;
 

divi/src/rpcmasternode.cpp

@@ -266,7 +266,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,CBitcoinSecret(masternodeKey).ToString(),txHash,outputIndex);
+    CMasternodeConfig::CMasternodeEntry config(alias,ipAndPort,CBitcoinSecret(masternodeKey).ToString(),txHash,outputIndex, "");
 
     CMasternodeBroadcast mnb;
     std::string errorMsg;

divi/src/test/ActiveMasternode_tests.cpp

@@ -25,7 +25,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), "");
     }
 };
 
@@ -98,4 +98,4 @@ BOOST_AUTO_TEST_CASE(willSetMatchingPubkeyForPrivateKey)
     BOOST_CHECK(activeMasternode_->pubKeyMasternode == expectedPubkey);
 }
 
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END()