Merge branch 'release_v4.7.0.1' into feature/update4.7.0version

# Conflicts:
#	framework/src/main/java/org/tron/program/Version.java

Author: forfreeday

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

@@ -2,9 +2,9 @@
 
 public class Version {
 
-  public static final String VERSION_NAME = "GreatVoyage-v4.5.2-125-ga2906563d";
-  public static final String VERSION_CODE = "17198";
-  private static final String VERSION = "4.7.0";
+  public static final String VERSION_NAME = "GreatVoyage-v4.6.0-385-g4445a420c";
+  public static final String VERSION_CODE = "17585";
+  private static final String VERSION = "4.7.0.1";
 
   public static String getVersion() {
     return VERSION;

protocol/build.gradle

@@ -1,14 +1,12 @@
 apply plugin: 'com.google.protobuf'
 
-def protobufVersion = "3.20.3"
+def protobufVersion = "3.19.2"
 
 def grpcVersion = "1.14.0"
 
 dependencies {
     compile group: 'com.google.protobuf', name: 'protobuf-java', version: protobufVersion
     compile group: 'com.google.protobuf', name: 'protobuf-java-util', version: protobufVersion
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
-
     compile group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
 
 //    checkstyleConfig "com.puppycrawl.tools:checkstyle:${versions.checkstyle}"
@@ -19,9 +17,6 @@ dependencies {
     // end google grpc
 
     compile group: 'com.google.api.grpc', name: 'googleapis-common-protos', version: '0.0.3'
-    compile group: 'io.netty', name: 'netty-codec-http', version: '4.1.78.Final'
-    compile group: 'io.netty', name: 'netty-handler', version: '4.1.78.Final'
-    compile group: 'io.netty', name: 'netty-codec-http2', version: '4.1.78.Final'
 }
 
 tasks.matching { it instanceof Test }.all {