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

Author: CodeNinjaEvan

.travis.yml

@@ -18,3 +18,5 @@ deploy:
     branch: develop
 after_deploy:
   - ./gradlew stest
+
+

README.md

@@ -271,7 +271,7 @@ Then, run `FullNode::main()` again.
 ### Running multi-nodes
 
 To run TRON on more than one node, you need to specify several seed nodes' IPs in `config.conf` in `seed.node.ip.list`:
-For private testnet, the IPs are allocated by yourself.
+For private test net, the IPs are allocated by yourself.
 
 ## Running a local node and connecting to the public testnet 
 
@@ -292,8 +292,6 @@ cd build/libs
 java -jar java-tron.jar
 ```
 
-It is almost the same as that does in the private testnet, except that the IPs in the `config.conf` are officially declared by TRON.
-
 ### Running a Super Node
 
 * Use the executable JAR(Recommend the way)

src/main/java/org/tron/common/overlay/message/PingMessage.java

@@ -24,7 +24,7 @@ public byte[] getData() {
 
   @Override
   public String toString() {
-    return "[" + getType().name() + "]";
+    return super.toString();
   }
 
   @Override

src/main/java/org/tron/common/overlay/message/PongMessage.java

@@ -23,7 +23,7 @@ public byte[] getData() {
 
   @Override
   public String toString() {
-    return "[" + this.getType().name() + "]";
+    return super.toString();
   }
 
   @Override

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<>();
 
@@ -137,8 +137,8 @@ public synchronized boolean procPeer(Channel peer) {
         return false;
       }
     }
-    logger.info("Add active peer {}, total active peers: {}", peer, activePeers.size());
     activePeers.put(peer.getNodeIdWrapper(), peer);
+    logger.info("Add active peer {}, total active peers: {}", peer, activePeers.size());
     return true;
   }
 

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

@@ -15,6 +15,7 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.message.Message;
+import org.tron.common.overlay.message.PingMessage;
 import org.tron.common.overlay.message.ReasonCode;
 
 @Component
@@ -25,6 +26,8 @@ public class MessageQueue {
 
   private volatile boolean sendMsgFlag = false;
 
+  private volatile long sendTime;
+
   private Thread sendMsgThread;
 
   private Channel channel;
@@ -84,11 +87,20 @@ public void setChannel(Channel channel) {
   }
 
   public void sendMessage(Message msg) {
+
+    if (msg instanceof PingMessage && sendTime > System.currentTimeMillis() - 10_000){
+      return;
+    }
+
     logger.info("Send to {}, {} ", ctx.channel().remoteAddress(), msg);
-    if (msg.getAnswerMessage() != null)
+
+    sendTime = System.currentTimeMillis();
+
+    if (msg.getAnswerMessage() != null){
       requestQueue.add(new MessageRoundtrip(msg));
-    else
+    }else {
       msgQueue.offer(msg);
+    }
   }
 
   public void receivedMessage(Message msg){

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

@@ -26,8 +26,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.message.DisconnectMessage;
@@ -38,8 +36,6 @@
 @Scope("prototype")
 public class P2pHandler extends SimpleChannelInboundHandler<P2pMessage> {
 
-  private final static Logger logger = LoggerFactory.getLogger("P2pHandler");
-
   private static ScheduledExecutorService pingTimer =
       Executors.newSingleThreadScheduledExecutor(r -> new Thread(r, "P2pPingTimer"));
 
@@ -49,9 +45,9 @@ public class P2pHandler extends SimpleChannelInboundHandler<P2pMessage> {
 
   private ScheduledFuture<?> pingTask;
 
-  private boolean hasPing = false;
+  private volatile boolean hasPing = false;
 
-  private long sendPingTime;
+  private volatile long sendPingTime;
 
   private ChannelHandlerContext ctx;
 

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

@@ -27,6 +27,9 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +39,9 @@
 import org.tron.common.overlay.discover.Node;
 import org.tron.common.overlay.discover.NodeHandler;
 import org.tron.common.overlay.discover.NodeManager;
+import org.tron.common.utils.Sha256Hash;
 import org.tron.core.config.args.Args;
+import org.tron.core.net.message.TransactionMessage;
 import org.tron.core.net.peer.PeerConnection;
 import org.tron.core.net.peer.PeerConnectionDelegate;
 
@@ -49,6 +54,9 @@ public class SyncPool {
 
   private final List<PeerConnection> activePeers = Collections.synchronizedList(new ArrayList<PeerConnection>());
 
+  private Cache<NodeHandler, Long> nodeHandlerCache = CacheBuilder.newBuilder()
+          .maximumSize(1000).expireAfterWrite(120, TimeUnit.SECONDS).recordStats().build();
+
   @Autowired
   private NodeManager nodeManager;
 
@@ -102,7 +110,10 @@ private void fillUp() {
     nodesInUse.add(nodeManager.getPublicHomeNode().getHexId());
 
     List<NodeHandler> newNodes = nodeManager.getNodes(new NodeSelector(nodesInUse), lackSize);
-    newNodes.forEach(n -> peerClient.connectAsync(n, false));
+    newNodes.forEach(n -> {
+      peerClient.connectAsync(n, false);
+      nodeHandlerCache.put(n, System.currentTimeMillis());
+    });
   }
 
   // for test only
@@ -112,17 +123,17 @@ public void addActivePeers(PeerConnection p) {
 
 
   synchronized void logActivePeers() {
+
     logger.info("-------- active node {}", nodeManager.dumpActiveNodes().size());
-    nodeManager.dumpActiveNodes().forEach(handler -> {
+      nodeManager.dumpActiveNodes().forEach(handler -> {
       if (handler.getNode().getPort() == 18888) {
         logger.info("address: {}:{}, ID:{} {}",
-            handler.getNode().getHost(), handler.getNode().getPort(),
-            handler.getNode().getHexIdShort(), handler.getNodeStatistics().toString());
+        handler.getNode().getHost(), handler.getNode().getPort(),
+        handler.getNode().getHexIdShort(), handler.getNodeStatistics().toString());
       }
-    });
+     });
 
-    logger.info("-------- active channel {}, node in user size {}", channelManager.getActivePeers().size(),
-            channelManager.nodesInUse().size());
+    logger.info("-------- active channel {}", channelManager.getActivePeers().size());
     for (Channel channel: channelManager.getActivePeers()){
       logger.info(channel.toString());
     }
@@ -203,6 +214,10 @@ public boolean test(NodeHandler handler) {
         return false;
       }
 
+      if (nodeHandlerCache.getIfPresent(handler) != null){
+        return false;
+      }
+
       if (handler.getNodeStatistics().getReputation() < 100) {
         return false;
       }

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

@@ -128,6 +128,19 @@ public boolean validate() throws ContractValidateException {
         throw new ContractValidateException("Invalidate description");
       }
 
+      if (assetIssueContract.getStartTime() == 0) {
+        throw new ContractValidateException("start time should be not empty");
+      }
+      if (assetIssueContract.getEndTime() == 0) {
+        throw new ContractValidateException("end time should be not empty");
+      }
+      if (assetIssueContract.getEndTime() <= assetIssueContract.getStartTime()) {
+        throw new ContractValidateException("end time should be greater than start time");
+      }
+      if (assetIssueContract.getStartTime() < dbManager.getHeadBlockTimeStamp()){
+        throw new ContractValidateException("start time should be greater than HeadBlockTime");
+      }
+
       if (this.dbManager.getAssetIssueStore().get(assetIssueContract.getName().toByteArray())
           != null) {
         throw new ContractValidateException("Token exists");
@@ -179,12 +192,12 @@ public boolean validate() throws ContractValidateException {
         throw new ContractValidateException("Account not exists");
       }
 
-      if (accountCapsule.getFrozenSupplyCount() != 0) {
-        throw new ContractValidateException("An account can only issue one asset at a time");
+      if (!accountCapsule.getAssetIssuedName().isEmpty()) {
+        throw new ContractValidateException("An account can only issue one asset");
       }
 
       if (accountCapsule.getBalance() < calcFee()) {
-        throw new ContractValidateException("No enough blance for fee!");
+        throw new ContractValidateException("No enough balance for fee!");
       }
     } catch (InvalidProtocolBufferException e) {
       throw new ContractValidateException(e.getMessage());

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

@@ -28,19 +28,19 @@ public boolean execute(TransactionResultCapsule ret)
       throws ContractExeException {
     long fee = calcFee();
     try {
-
       AccountCreateContract accountCreateContract = contract.unpack(AccountCreateContract.class);
       AccountCapsule accountCapsule = new AccountCapsule(accountCreateContract,
           dbManager.getHeadBlockTimeStamp());
       dbManager.getAccountStore()
           .put(accountCreateContract.getOwnerAddress().toByteArray(), accountCapsule);
       ret.setStatus(fee, code.SUCESS);
-      return true;
     } catch (InvalidProtocolBufferException e) {
       ret.setStatus(fee, code.FAILED);
       logger.debug(e.getMessage(), e);
       throw new ContractExeException(e.getMessage());
     }
+
+    return true;
   }
 
   @Override