Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x

src/protocol.cpp

@@ -22,19 +22,15 @@ static const char* ppszTypeName[] =
     "tx lock request",
     "tx lock vote",
     "spork",
-    "masternode winner",
+    "mn winner",
-    "masternode scan",
+    "mn scan error",
-    "masternode vote",
+    "mn budget vote",
-    "masternode proposal",
+    "mn budget proposal",
-    "masternode quorum",
+    "mn budget finalized",
-    "masternode announce",
+    "mn budget finalized vote",
-    "masternode ping",
+    "mn quorum",
-    "unknown",
+    "mn announce",
-    "unknown",
+    "mn ping"
-    "unknown",
-    "unknown",
-    "unknown",
-    "unknown"
 };
 
 CMessageHeader::CMessageHeader()
@@ -133,7 +129,7 @@ CInv::CInv(const std::string& strType, const uint256& hashIn)
         }
     }
     if (i == ARRAYLEN(ppszTypeName))
-        throw std::out_of_range(strprintf("CInv::CInv(string, uint256) : unknown type '%s'", strType));
+        LogPrint("net", "CInv::CInv(string, uint256) : unknown type '%s'", strType);
     hash = hashIn;
 }
 
@@ -150,7 +146,8 @@ bool CInv::IsKnownType() const
 const char* CInv::GetCommand() const
 {
     if (!IsKnownType())
-        throw std::out_of_range(strprintf("CInv::GetCommand() : type=%d unknown type", type));
+        LogPrint("net", "CInv::GetCommand() : type=%d unknown type", type);
+
     return ppszTypeName[type];
 }