Merge pull request #2389 from tronprotocol/release_3.6.2

Release 3.6.2 merge to master

Author: xxo1shine

.travis.yml

@@ -4,19 +4,19 @@ language: java
 jdk: oraclejdk8
 addons:
   ssh_known_hosts:
-    - 47.93.42.145:22008
-    - 47.93.42.145:22008
-    - 47.93.42.145:22008
-    - 47.93.18.60:22008
-    - 47.93.18.60:22008
-    - 47.93.18.60:22008
+  - 47.93.42.145:22008
+  - 47.93.42.145:22008
+  - 47.93.42.145:22008
+  - 47.93.18.60:22008
+  - 47.93.18.60:22008
+  - 47.93.18.60:22008
   sonarcloud:
     organization: tron-zhaohong
     token:
       secure: "KXWEeQ1elAoQ0XfR54TQWfhrIdDP0+2CYPv2X9aWpU/YDl7hqZBAjcCOAUGvlbyM54jtG6YMaWwG48jlrOwwl5l/VjWSnUXF+7ixQy5ki0Ci9s7Y1pTQwV9SpL8TLIK2TYqabN8Mw+FJULASXLjYr9GerbbcUbCPTmcL6mQKw6ivxxpNPmz4eNoKAEuOzruO9fTXGAV3yr8Nn85c+mVxV8EUhkR17zpE9O8fvzOtSnYArWNOSCgDBn0EG45UNNPF2vn44s1c3h3gX1m3WK6PeCXPgy3hPqRn3wTG+xglnbqthGpo2wt1rJ83af+BwdYwvPEcUq84yLgXcE/aMkTKcVAfPWBP/6vblaoI90jxCeFji+MdMimKZAqIXt7oLqDZVmIq65de5YC5s7QTSbzJNY/tsAu3dqzSfbUJY6CRNFDcoenVpvgQkqb37TkDah4mJM8EUjbu2A9Q2HSFbyCVsQJtdasuu9cBOf6azK3U0XgFNBc0y2aziZrTnX30q7bi+5L/mbTnRdXrDqBOqyPeGtT77UZfcajHHmEWU/e6gYWiA/c+K25n13DD53Au6gpnnQ6ALeUl/1gDwz3fPBebJ5bVWrkIcLj7bbysjzfOvQmDS6G13RNz58Hm0/B7bVtZTr1E1q6Z1zEJwbuJYEJASNcezAfK5x/hIfZTGNqT3M8="
 cache:
   directories:
-    - '$HOME/.sonar/cache'
+  - '$HOME/.sonar/cache'
 matrix:
   include:
   - name: build

build.gradle

@@ -23,7 +23,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "jacoco"
 apply plugin: 'maven-publish'
 
-jar.enabled = false
+jar.enabled = true
 shadowJar.enabled = true
 
 sourceCompatibility = 1.8

src/main/java/org/tron/core/services/WitnessService.java

@@ -2,11 +2,14 @@
 
 import static org.tron.core.witness.BlockProductionCondition.NOT_MY_TURN;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Maps;
 import com.google.protobuf.ByteString;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import lombok.Getter;
@@ -36,6 +39,7 @@
 import org.tron.core.exception.ValidateSignatureException;
 import org.tron.core.net.TronNetService;
 import org.tron.core.net.message.BlockMessage;
+import org.tron.core.net.peer.Item;
 import org.tron.core.witness.BlockProductionCondition;
 import org.tron.core.witness.WitnessController;
 
@@ -77,6 +81,7 @@ public class WitnessService implements Service {
   private AtomicLong dupBlockTime = new AtomicLong(0);
   private long blockCycle =
       ChainConstant.BLOCK_PRODUCED_INTERVAL * ChainConstant.MAX_ACTIVE_WITNESS_NUM;
+  private Cache<ByteString, Long> blocks = CacheBuilder.newBuilder().maximumSize(10).build();
 
   /**
    * Construction method.
@@ -338,6 +343,11 @@ private boolean dupWitnessCheck() {
 
   public void checkDupWitness(BlockCapsule block) {
     if (block.generatedByMyself) {
+      blocks.put(block.getBlockId().getByteString(), System.currentTimeMillis());
+      return;
+    }
+
+    if (blocks.getIfPresent(block.getBlockId().getByteString()) != null) {
       return;
     }
 

src/main/resources/config.conf

@@ -149,8 +149,8 @@ node {
   ]
 
   fastForward = [
-    "47.90.208.194:18888",
-    "47.75.212.39:18888"
+    "100.26.245.209:18888",
+    "15.188.6.125:18888"
   ]
 
   http {