Merge pull request #1585 from cyrossignol/fix-beacon-length-warning

Fix incorrect beacon length warning in GUI transaction list

Author: jamescowens

src/qt/bitcoinstrings.cpp

@@ -140,7 +140,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Compute Neural Network Hashes..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks proxy"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Contract length for beacon is less then 256 in length. Size: "),
+QT_TRANSLATE_NOOP("bitcoin-core", "Invalid beacon contract. Size: "),
 QT_TRANSLATE_NOOP("bitcoin-core", "Current Neural Hash"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Data"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Delete Beacon Contract"),

src/rpcrawtransaction.cpp

@@ -114,21 +114,23 @@ std::vector<std::pair<std::string, std::string>> GetTxNormalBoincHashInfo(const
                 {
                     res.push_back(std::make_pair(_("Message Type"), _("Add Beacon Contract")));
 
-                    std::string sBeaconEncodedContract = ExtractXML(msg, "<MV>", "</MV>");
+                    bool invalid = false;
+                    const std::string sBeaconEncodedContract = ExtractXML(msg, "<MV>", "</MV>");
+                    const std::string sBeaconDecodedContract = DecodeBase64(sBeaconEncodedContract, &invalid);
 
-                    if (sBeaconEncodedContract.length() < 256)
+                    if (invalid)
                     {
-                        // If for whatever reason the contract is not a proper one and the average length does exceed this size; Without this a seg fault will occur on the DecodeBase64
-                        // Another example is if an admin accidently uses add instead of delete in addkey to remove a beacon the 1 in <MV>1</MV> would cause a seg fault as well
-                        res.push_back(std::make_pair(_("ERROR"), _("Contract length for beacon is less then 256 in length. Size: ") + ToString(sBeaconEncodedContract.length())));
+                        // If for whatever reason the contract is not a proper one.
+                        // Another example is if an admin accidently uses add instead
+                        // of delete in addkey to remove a beacon the 1 in <MV>1</MV>
+                        res.push_back(std::make_pair(_("ERROR"), _("Invalid beacon contract. Size: ") + ToString(sBeaconEncodedContract.length())));
 
                         if (fDebug)
                             res.push_back(std::make_pair(_("Message Data"), sBeaconEncodedContract));
 
                         return res;
                     }
 
-                    std::string sBeaconDecodedContract = DecodeBase64(sBeaconEncodedContract);
                     std::vector<std::string> vBeaconContract = split(sBeaconDecodedContract.c_str(), ";");
                     std::string sBeaconAddress = vBeaconContract[2];
                     std::string sBeaconPublicKey = vBeaconContract[3];