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

Author: CodeNinjaEvan

.travis.yml

@@ -9,7 +9,7 @@ addons:
   ssh_known_hosts:
   - 47.93.9.236:22008
 skip_build:
-- README.md
+- README.md：
 - LICENSE
 deploy:
   provider: script

build.gradle

@@ -6,6 +6,8 @@ apply plugin: 'com.google.protobuf'
 apply plugin: 'application'
 apply plugin: 'checkstyle'
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: "jacoco"
+
 
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
@@ -33,6 +35,11 @@ def versions = [
         checkstyle: '8.7',
 ]
 
+jacoco {
+    toolVersion = "0.8.1"
+}
+
+
 configurations {
     checkstyleConfig
 
@@ -215,6 +222,10 @@ test {
     testLogging {
         exceptionFormat = 'full'
     }
+    jacoco {
+        append = false
+        destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
+    }
 }
 
 task stest(type:Test){

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

@@ -17,7 +17,6 @@
  */
 package org.tron.common.overlay.server;
 
-import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;
 import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
@@ -138,7 +137,6 @@ public void publicHandshakeFinished(ChannelHandlerContext ctx, HelloMessage msg)
         setStartTime(msg.getTimestamp());
         setTronState(TronState.HANDSHAKE_FINISHED);
         getNodeStatistics().p2pHandShake.add();
-        channelManager.add(this);
         logger.info("Finish handshake with {}.", ctx.channel().remoteAddress());
     }
 

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

@@ -85,7 +85,8 @@ public Set<String> nodesInUse() {
 
   public void disconnect(Channel peer, ReasonCode reason) {
     peer.disconnect(reason);
-    InetSocketAddress socketAddress = (InetSocketAddress)peer.getChannelHandlerContext().channel().remoteAddress();
+    InetSocketAddress socketAddress = (InetSocketAddress) peer.getChannelHandlerContext().channel()
+        .remoteAddress();
     recentlyDisconnected.put(socketAddress.getAddress(), new Date());
   }
 
@@ -115,34 +116,30 @@ public boolean isRecentlyDisconnected(InetAddress peerAddr) {
     }
   }
 
-  public void add(Channel peer) {
-    if (isShouldAddToActivePeers(peer)) {
-      activePeers.put(peer.getNodeIdWrapper(), peer);
-      syncPool.onConnect(peer);
-      logger.info("Add active peer {}, total active peers: {}", peer, activePeers.size());
-    }
-  }
-
-  private boolean isShouldAddToActivePeers(Channel peer) {
+  public synchronized boolean procPeer(Channel peer) {
     if (peer.getNodeStatistics().isPenalized()) {
       disconnect(peer, peer.getNodeStatistics().getDisconnectReason());
       return false;
-    } else if (!peer.isActive() && activePeers.size() >= maxActivePeers) {
+    }
+
+    if (!peer.isActive() && activePeers.size() >= maxActivePeers) {
       disconnect(peer, TOO_MANY_PEERS);
       return false;
-    } else if (activePeers.containsKey(peer.getNodeIdWrapper())) {
+    }
+
+    if (activePeers.containsKey(peer.getNodeIdWrapper())) {
       Channel channel = activePeers.get(peer.getNodeIdWrapper());
       if (channel.getStartTime() > peer.getStartTime()) {
         logger.info("Disconnect connection established later, {}", channel.getNode());
         disconnect(channel, DUPLICATE_PEER);
-        return true;
       } else {
         disconnect(peer, DUPLICATE_PEER);
         return false;
       }
-    } else {
-      return true;
     }
+    logger.info("Add active peer {}, total active peers: {}", peer, activePeers.size());
+    activePeers.put(peer.getNodeIdWrapper(), peer);
+    return true;
   }
 
   public Collection<Channel> getActivePeers() {

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

@@ -21,7 +21,6 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.util.Arrays;
 import java.util.List;
 import org.slf4j.Logger;
@@ -31,14 +30,15 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.discover.NodeManager;
-import org.tron.common.overlay.message.*;
-import org.tron.common.utils.ByteArray;
+import org.tron.common.overlay.message.DisconnectMessage;
+import org.tron.common.overlay.message.HelloMessage;
+import org.tron.common.overlay.message.P2pMessage;
+import org.tron.common.overlay.message.P2pMessageFactory;
+import org.tron.common.overlay.message.ReasonCode;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.net.peer.PeerConnection;
 
-import static org.tron.common.overlay.message.StaticMessages.PONG_MESSAGE;
-
 @Component
 @Scope("prototype")
 public class HandshakeHandler extends ByteToMessageDecoder {
@@ -51,13 +51,20 @@ public class HandshakeHandler extends ByteToMessageDecoder {
 
   private final NodeManager nodeManager;
 
+  private final ChannelManager channelManager;
+
   private Manager manager;
 
   private  P2pMessageFactory messageFactory = new P2pMessageFactory();
+  
+  @Autowired
+  private SyncPool syncPool;
 
   @Autowired
-  public HandshakeHandler(final NodeManager nodeManager, final Manager manager) {
+  public HandshakeHandler(final NodeManager nodeManager, final ChannelManager channelManager,
+      final Manager manager) {
     this.nodeManager = nodeManager;
+    this.channelManager = channelManager;
     this.manager = manager;
   }
 
@@ -140,14 +147,19 @@ private void handleHelloMsg(ChannelHandlerContext ctx, HelloMessage msg) {
       return;
     }
 
-    if (remoteId.length != 64) {
-      sendHelloMsg(ctx, msg.getTimestamp());
-    }
-
     ((PeerConnection)channel).setHelloMessage(msg);
 
     channel.getNodeStatistics().p2pInHello.add();
 
     channel.publicHandshakeFinished(ctx, msg);
+    if (!channelManager.procPeer(channel)) {
+      return;
+    }
+
+    if (remoteId.length != 64) {
+      sendHelloMsg(ctx, msg.getTimestamp());
+    }
+
+    syncPool.onConnect(channel);
   }
 }

src/main/java/org/tron/core/actuator/AssetIssueActuator.java

@@ -49,13 +49,6 @@ public class AssetIssueActuator extends AbstractActuator {
   public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
     long fee = calcFee();
     try {
-      if (!this.contract.is(AssetIssueContract.class)) {
-        throw new ContractExeException();
-      }
-
-      if (dbManager == null) {
-        throw new ContractExeException();
-      }
       AssetIssueContract assetIssueContract = contract.unpack(AssetIssueContract.class);
       byte[] ownerAddress = assetIssueContract.getOwnerAddress().toByteArray();
       AssetIssueCapsule assetIssueCapsule = new AssetIssueCapsule(assetIssueContract);
@@ -112,11 +105,13 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
 
   @Override
   public boolean validate() throws ContractValidateException {
-    if (!this.contract.is(AssetIssueContract.class)) {
-      throw new ContractValidateException();
-    }
-
     try {
+      if (!this.contract.is(AssetIssueContract.class)) {
+        throw new ContractValidateException();
+      }
+      if (this.dbManager == null) {
+        throw new ContractValidateException();
+      }
       final AssetIssueContract assetIssueContract = this.contract.unpack(AssetIssueContract.class);
 
       if (!Wallet.addressValid(assetIssueContract.getOwnerAddress().toByteArray())) {

src/main/java/org/tron/core/actuator/FreezeBalanceActuator.java

@@ -22,7 +22,6 @@ public class FreezeBalanceActuator extends AbstractActuator {
     super(contract, dbManager);
   }
 
-
   @Override
   public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
     long fee = calcFee();
@@ -93,7 +92,9 @@ public boolean validate() throws ContractValidateException {
             "contract type error,expected type [FreezeBalanceContract],real type[" + contract
                 .getClass() + "]");
       }
-
+      if (this.dbManager == null) {
+        throw new ContractValidateException();
+      }
       FreezeBalanceContract freezeBalanceContract = this.contract
           .unpack(FreezeBalanceContract.class);
       ByteString ownerAddress = freezeBalanceContract.getOwnerAddress();

src/main/java/org/tron/core/actuator/ParticipateAssetIssueActuator.java

@@ -30,6 +30,7 @@
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.protos.Contract;
+import org.tron.protos.Contract.ParticipateAssetIssueContract;
 import org.tron.protos.Protocol;
 
 
@@ -43,9 +44,8 @@ public class ParticipateAssetIssueActuator extends AbstractActuator {
   @Override
   public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
     long fee = calcFee();
-
     try {
-      Contract.ParticipateAssetIssueContract participateAssetIssueContract =
+      ParticipateAssetIssueContract participateAssetIssueContract =
           contract.unpack(Contract.ParticipateAssetIssueContract.class);
 
       long cost = participateAssetIssueContract.getAmount();
@@ -78,8 +78,6 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
       dbManager.getAccountStore().put(toAddressBytes, toAccount);
 
       ret.setStatus(fee, Protocol.Transaction.Result.code.SUCESS);
-
-      return true;
     } catch (InvalidProtocolBufferException e) {
       ret.setStatus(fee, Protocol.Transaction.Result.code.FAILED);
       logger.debug(e.getMessage(), e);
@@ -89,15 +87,19 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
       logger.debug(e.getMessage(), e);
       throw new ContractExeException(e.getMessage());
     }
+
+    return true;
   }
 
   @Override
   public boolean validate() throws ContractValidateException {
-    if (!this.contract.is(Contract.ParticipateAssetIssueContract.class)) {
-      throw new ContractValidateException();
-    }
-
     try {
+      if (!this.contract.is(ParticipateAssetIssueContract.class)) {
+        throw new ContractValidateException();
+      }
+      if (this.dbManager == null) {
+        throw new ContractValidateException();
+      }
       final Contract.ParticipateAssetIssueContract participateAssetIssueContract =
           this.contract.unpack(Contract.ParticipateAssetIssueContract.class);
       //Parameters check

src/main/java/org/tron/core/actuator/TransferActuator.java

@@ -69,6 +69,12 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
   @Override
   public boolean validate() throws ContractValidateException {
     try {
+      if (!this.contract.is(TransferContract.class)) {
+        throw new ContractValidateException();
+      }
+      if (this.dbManager == null) {
+        throw new ContractValidateException();
+      }
       if (transferContract == null) {
         throw new ContractValidateException(
             "contract type error,expected type [TransferContract],real type[" + contract

src/main/java/org/tron/core/actuator/TransferAssetActuator.java

@@ -41,14 +41,6 @@ public class TransferAssetActuator extends AbstractActuator {
   @Override
   public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
     long fee = calcFee();
-    if (!this.contract.is(TransferAssetContract.class)) {
-      throw new ContractExeException();
-    }
-
-    if (this.dbManager == null) {
-      throw new ContractExeException();
-    }
-
     try {
       TransferAssetContract transferAssetContract = this.contract
           .unpack(TransferAssetContract.class);
@@ -76,12 +68,19 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
       ret.setStatus(fee, code.FAILED);
       throw new ContractExeException(e.getMessage());
     }
+
     return true;
   }
 
   @Override
   public boolean validate() throws ContractValidateException {
     try {
+      if (!this.contract.is(TransferAssetContract.class)) {
+        throw new ContractValidateException();
+      }
+      if (this.dbManager == null) {
+        throw new ContractValidateException();
+      }
       TransferAssetContract transferAssetContract = this.contract
           .unpack(TransferAssetContract.class);
 
@@ -129,7 +128,6 @@ public boolean validate() throws ContractValidateException {
         throw new ContractValidateException("assetBalance is not sufficient.");
       }
 
-      // if account with to_address is not existed,  create it.
       AccountCapsule toAccount = this.dbManager.getAccountStore().get(toAddress);
       if (toAccount == null) {
         throw new ContractValidateException("To account is not exit!");