Merge pull request tronprotocol#4352 from tronprotocol/master

Master merge to develop

Author: lvs007

framework/src/main/java/org/tron/core/services/http/JsonFormat.java

@@ -147,10 +147,12 @@ protected static void print(Message message, JsonGenerator generator, boolean se
         generator.print(",");
       }
     }
-    if (message.getUnknownFields().asMap().size() > 0) {
-      generator.print(", ");
-    }
-    printUnknownFields(message.getUnknownFields(), generator, selfType);
+
+    // do not print unknown fields
+    // if (message.getUnknownFields().asMap().size() > 0) {
+    //   generator.print(", ");
+    // }
+    // printUnknownFields(message.getUnknownFields(), generator, selfType);
   }
 
   /**
@@ -421,15 +423,19 @@ protected static void printUnknownFields(UnknownFieldSet unknownFields, JsonGene
         } else {
           generator.print(", ");
         }
+        generator.print("\"");
         generator.print(String.format((Locale) null, "0x%08x", value));
+        generator.print("\"");
       }
       for (long value : field.getFixed64List()) {
         if (firstValue) {
           firstValue = false;
         } else {
           generator.print(", ");
         }
+        generator.print("\"");
         generator.print(String.format((Locale) null, "0x%016x", value));
+        generator.print("\"");
       }
       for (ByteString value : field.getLengthDelimitedList()) {
         if (firstValue) {

framework/src/main/java/org/tron/program/Version.java

@@ -2,9 +2,9 @@
 
 public class Version {
 
-  public static final String VERSION_NAME = "GreatVoyage-v4.4.2-94-g38dfe231c";
-  public static final String VERSION_CODE = "16676";
-  private static final String VERSION = "4.4.4";
+  public static final String VERSION_NAME = "GreatVoyage-v4.4.4-3-g5f6660e30";
+  public static final String VERSION_CODE = "16681";
+  private static final String VERSION = "4.4.5";
 
   public static String getVersion() {
     return VERSION;