Dealing with duplication trx

Author: xxo1shine

src/main/java/org/tron/common/overlay/server/ChannelManager.java

@@ -46,7 +46,7 @@ public class ChannelManager {
 
   private static final Logger logger = LoggerFactory.getLogger("ChannelManager");
 
-  private static final int inboundConnectionBanTimeout = 60 * 1000;
+  private static final int inboundConnectionBanTimeout = 30 * 1000;
 
   private final Map<ByteArrayWrapper, Channel> activePeers = new ConcurrentHashMap<>();
 

src/main/java/org/tron/core/net/node/NodeImpl.java

@@ -852,7 +852,7 @@ private void cleanUpSyncPeer(PeerConnection peer, ReasonCode reasonCode) {
     disconnectPeer(peer, reasonCode);
   }
 
-  synchronized boolean isExist(TransactionMessage trxMsg){
+  synchronized boolean isTrxExist(TransactionMessage trxMsg){
     if (TrxCache.getIfPresent(trxMsg.getMessageId()) != null){
       return true;
     }
@@ -861,19 +861,18 @@ synchronized boolean isExist(TransactionMessage trxMsg){
   }
 
   private void onHandleTransactionMessage(PeerConnection peer, TransactionMessage trxMsg) {
-    if (isExist(trxMsg)){
-      return;
-    }
-    //logger.info("on handle transaction message");
     try {
       Item item = new Item(trxMsg.getMessageId(), InventoryType.TRX);
       if (!peer.getAdvObjWeRequested().containsKey(item)) {
         throw new TraitorPeerException("We don't send fetch request to" + peer);
-      } else {
-        peer.getAdvObjWeRequested().remove(item);
-        del.handleTransaction(trxMsg.getTransactionCapsule());
-        broadcast(trxMsg);
       }
+      peer.getAdvObjWeRequested().remove(item);
+      if (isTrxExist(trxMsg)){
+        logger.info("Trx {} from Peer {} already processed.", trxMsg.getMessageId(), peer.getNode().getHost());
+        return;
+      }
+      del.handleTransaction(trxMsg.getTransactionCapsule());
+      broadcast(trxMsg);
     } catch (TraitorPeerException e) {
       logger.error(e.getMessage());
       banTraitorPeer(peer, ReasonCode.BAD_PROTOCOL);