Merge branch 'release_v4.7.2' of https://github.com/tronprotocol/java-tron into release_v4.7.2

Author: xxo1shine

build.gradle

@@ -44,7 +44,7 @@ subprojects {
         annotationProcessor 'org.projectlombok:lombok:1.18.12'
         testCompileOnly 'org.projectlombok:lombok:1.18.12'
         testAnnotationProcessor 'org.projectlombok:lombok:1.18.12'
-        compile group: 'com.google.guava', name: 'guava', version: '24.1-jre'
+        compile group: 'com.google.guava', name: 'guava', version: '30.1-jre'
         compile "com.google.code.findbugs:jsr305:3.0.0"
         compile group: 'org.springframework', name: 'spring-context', version: '5.3.18'
         compile group: 'org.springframework', name: 'spring-tx', version: '5.3.18'
@@ -70,6 +70,12 @@ subprojects {
         resolutionStrategy {
             force group: 'com.google.guava', name: 'guava', version: '30.1-jre'
         }
+        resolutionStrategy.eachDependency { details ->
+            // TODO if update grpc remove
+            if(details.requested.group == 'io.netty') {
+                details.useVersion "4.1.27.Final"
+            }
+        }
     }
 }
 

common/build.gradle

@@ -53,7 +53,13 @@ dependencies {
     compile 'org.aspectj:aspectjrt:1.8.13'
     compile 'org.aspectj:aspectjweaver:1.8.13'
     compile 'org.aspectj:aspectjtools:1.8.13'
-    compile group: 'com.github.tronprotocol', name: 'libp2p', version: 'test-v0.2.20'
+    compile group: 'com.github.tronprotocol', name: 'libp2p', version: 'test-v0.2.21',{
+        exclude group: 'io.grpc', module: 'grpc-context'
+        exclude group: 'io.grpc', module: 'grpc-core'
+        exclude group: 'io.grpc', module: 'grpc-netty'
+        exclude group: 'com.google.protobuf', module: 'protobuf-java'
+        exclude group: 'com.google.protobuf', module: 'protobuf-java-util'
+    }
     compile project(":protocol")
 }
 

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -1335,7 +1335,12 @@ public static PublishConfig loadDnsPublishConfig(final com.typesafe.config.Confi
     if (config.hasPath(Constant.NODE_DNS_PUBLISH)) {
       publishConfig.setDnsPublishEnable(config.getBoolean(Constant.NODE_DNS_PUBLISH));
     }
+    loadDnsPublishParameters(config, publishConfig);
+    return publishConfig;
+  }
 
+  public static void loadDnsPublishParameters(final com.typesafe.config.Config config,
+      PublishConfig publishConfig) {
     if (publishConfig.isDnsPublishEnable()) {
       if (config.hasPath(Constant.NODE_DNS_DOMAIN) && StringUtils.isNotEmpty(
           config.getString(Constant.NODE_DNS_DOMAIN))) {
@@ -1427,7 +1432,6 @@ public static PublishConfig loadDnsPublishConfig(final com.typesafe.config.Confi
         }
       }
     }
-    return publishConfig;
   }
 
   private static void logEmptyError(String arg) {

framework/src/test/java/org/tron/core/net/NodeTest.java

@@ -9,6 +9,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 import org.tron.core.Constant;
@@ -79,9 +80,20 @@ public void testEndpointFromNode() {
   @Test
   public void testPublishConfig() {
     Config config = Configuration.getByFileName(Constant.TEST_CONF, Constant.TEST_CONF);
-    PublishConfig publishConfig = Args.loadDnsPublishConfig(config);
+
+    PublishConfig publishConfig = new PublishConfig();
+    Assert.assertFalse(publishConfig.isDnsPublishEnable());
+
+    publishConfig.setDnsPublishEnable(true);
+    Assert.assertTrue(publishConfig.isDnsPublishEnable());
+    Args.loadDnsPublishParameters(config, publishConfig);
     Assert.assertTrue(publishConfig.isDnsPublishEnable());
     Assert.assertEquals(5, publishConfig.getMaxMergeSize());
     Assert.assertEquals(DnsType.AwsRoute53, publishConfig.getDnsType());
   }
+
+  @After
+  public void destroy() {
+    Args.clearParam();
+  }
 }

framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java

@@ -33,6 +33,7 @@ public void init() {
   @After
   public void destroy() {
     Args.clearParam();
+    context.destroy();
     FileUtil.deleteDir(new File(dbPath));
   }
 

framework/src/test/java/org/tron/core/net/services/SyncServiceTest.java

@@ -44,6 +44,7 @@ public void init() {
   @After
   public void destroy() {
     Args.clearParam();
+    context.destroy();
     FileUtil.deleteDir(new File(dbPath));
   }
 

framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java

@@ -50,7 +50,7 @@ public class HttpApiAccessFilterTest {
   @BeforeClass
   public static void init() {
     Args.setParam(new String[]{"-d", dbPath}, Constant.TEST_CONF);
-    Args.getInstance().setFullNodeAllowShieldedTransactionArgs(false);
+    //Args.getInstance().setFullNodeAllowShieldedTransactionArgs(false);
     context = new TronApplicationContext(DefaultConfig.class);
     appTest = ApplicationFactory.create(context);
     httpApiAccessFilter = context.getBean(HttpApiAccessFilter.class);

framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java

@@ -51,7 +51,7 @@ public class LiteFnQueryHttpFilterTest {
   @Before
   public void init() {
     Args.setParam(new String[]{"-d", dbPath}, Constant.TEST_CONF);
-    Args.getInstance().setFullNodeAllowShieldedTransactionArgs(false);
+    //Args.getInstance().setFullNodeAllowShieldedTransactionArgs(false);
     context = new TronApplicationContext(DefaultConfig.class);
     appTest = ApplicationFactory.create(context);
     FullNodeHttpApiService httpApiService = context

framework/src/test/java/org/tron/core/services/http/TriggerSmartContractServletTest.java

@@ -73,13 +73,12 @@ public static void init() throws Exception {
 
   @AfterClass
   public static void destroy() {
-    if (FileUtil.deleteDir(new File(dbPath))) {
-      logger.info("Release resources successful.");
-    } else {
-      logger.error("Release resources failure.");
-    }
+    Args.clearParam();
+    context.destroy();
+    FileUtil.deleteDir(new File(dbPath));
   }
 
+
   @Test
   public void testNormalCall() throws Exception {
     HttpMethed.waitToProduceOneBlock("127.0.0.1:8090");

framework/src/test/java/org/tron/core/services/ratelimiter/GlobalRateLimiterTest.java

@@ -1,6 +1,7 @@
 package org.tron.core.services.ratelimiter;
 
 import java.lang.reflect.Field;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
 import org.tron.core.Constant;
@@ -19,4 +20,9 @@ public void testAcquire() throws Exception {
     Assert.assertEquals(runtimeData.getRemoteAddr(), "127.0.0.1");
     GlobalRateLimiter.acquire(runtimeData);
   }
+
+  @AfterClass
+  public static void destroy() {
+    Args.clearParam();
+  }
 }