Merge pull request KomodoPlatform#573 from Asherda/release-v1.2.2-3

Invalid memo exception fix

src/key_io.cpp

@@ -987,6 +987,16 @@ std::vector<unsigned char> VectorEncodeVDXFUni(const UniValue &_obj)
 
     UniValue obj = _obj;
 
+    if (!obj.isObject())
+    {
+        std::string objStr = uni_get_str(obj);
+        if (IsHex(objStr))
+        {
+            return ParseHex(objStr);
+        }
+        return std::vector<unsigned char>(objStr.begin(), objStr.end());
+    }
+
     std::string serializedHex = uni_get_str(find_value(obj, "serializedhex"));
     if (!serializedHex.empty())
     {
@@ -1010,16 +1020,6 @@ std::vector<unsigned char> VectorEncodeVDXFUni(const UniValue &_obj)
         return std::vector<unsigned char>(serializedMessage.begin(), serializedMessage.end());
     }
 
-    if (obj.isStr())
-    {
-        std::string objStr = uni_get_str(obj);
-        if (IsHex(objStr))
-        {
-            return ParseHex(objStr);
-        }
-        return std::vector<unsigned char>(objStr.begin(), objStr.end());
-    }
-
     // this should be an object with "vdxfkey" as the key and {object} as the json object to serialize
     auto oneValKeys = obj.getKeys();
     auto oneValValues = obj.getValues();