Merge pull request #833 from tronprotocol/sonarcloud

Sonarcloud

Author: zhaohong

.travis.yml

@@ -1,13 +1,20 @@
 sudo: required
 language: java
 jdk: oraclejdk8
-script:
-- sh tron.sh
-- ./gradlew lint
-- ./gradlew test
 addons:
   ssh_known_hosts:
   - 47.93.9.236: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'
+script:
+- sh tron.sh
+- "./gradlew build"
+- sonar-scanner
 skip_build:
 - README.md：
 - LICENSE
@@ -17,6 +24,5 @@ deploy:
   on:
     branch: develop
 after_deploy:
-  - ./gradlew stest
-
+- "./gradlew stest"
 

build.gradle

@@ -1,3 +1,18 @@
+buildscript {
+    repositories {
+        maven { url 'http://mvnrepository.com' }
+        mavenCentral()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+    }
+}
+plugins {
+    id "org.sonarqube" version "2.6"
+}
+
 group 'org.tron'
 version '1.0.0'
 
@@ -8,7 +23,6 @@ apply plugin: 'checkstyle'
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "jacoco"
 
-
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 mainClassName = 'org.tron.program.FullNode'
@@ -18,19 +32,6 @@ repositories {
     mavenLocal()
     mavenCentral()
 }
-
-buildscript {
-    repositories {
-        maven { url 'http://mvnrepository.com' }
-        mavenCentral()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
-    }
-}
-
 def versions = [
         checkstyle: '8.7',
 ]
@@ -143,17 +144,15 @@ checkstyle {
 }
 
 checkstyleMain {
-    source 'src'
-    include '**/*.java'
-    exclude '**/gen/**'
+    source = 'src/main/java'
 }
 
 task lint(type: Checkstyle) {
     // Cleaning the old log because of the creation of the new ones (not sure if totaly needed)
     delete fileTree(dir: "${project.rootDir}/app/build/reports")
     source 'src'
     include '**/*.java'
-    exclude '**/gen/**'
+    exclude 'main/gen/**'
     // empty classpath
     classpath = files()
     //Failing the build
@@ -186,6 +185,7 @@ protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:3.5.1-1"
     }
+
     plugins {
         grpc {
             artifact = 'io.grpc:protoc-gen-grpc-java:1.9.0'
@@ -236,9 +236,9 @@ jacocoTestReport {
     }
 }
 
-task stest(type:Test){
-    useTestNG{
-        suites( file('src/test/resources/testng.xml') )
+task stest(type: Test) {
+    useTestNG {
+        suites(file('src/test/resources/testng.xml'))
     }
 
     testLogging {
@@ -247,7 +247,7 @@ task stest(type:Test){
     }
 }
 
-def binaryRelease(taskName,jarName,mainClass) {
+def binaryRelease(taskName, jarName, mainClass) {
     return tasks.create("${taskName}", Jar) {
         baseName = jarName
         version = null
@@ -267,7 +267,8 @@ def binaryRelease(taskName,jarName,mainClass) {
     }
 }
 
+
 artifacts {
-    archives(binaryRelease('buildSolidityNodeJar','SolidityNode','org.tron.program.SolidityNode'),
-            binaryRelease('buildFullNodeJar','FullNode','org.tron.program.FullNode'))
+    archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'),
+            binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'))
 }

sonar-project.properties

@@ -0,0 +1,19 @@
+sonar.projectKey=java-tron
+sonar.projectName=java-tron
+sonar.projectVersion=2.1
+# =====================================================
+#   Meta-data for the project
+# =====================================================
+sonar.links.homepage=https://github.com/tronprotocol/java-tron
+sonar.links.ci=https://travis-ci.org/tronprotocol/java-tron
+sonar.links.scm=https://github.com/tronprotocol/java-tron
+sonar.links.issue=https://github.com/tronprotocol/java-tron/issues
+# =====================================================
+#   Properties that will be shared amongst all modules
+# =====================================================
+# SQ standard properties
+sonar.sources=src/main
+sonar.tests=src/test
+sonar.java.binaries=build/classes
+# =====================================================
+#   Properties that will be shared amongst all modules

src/main/java/org/tron/core/config/Parameter.java

@@ -14,14 +14,15 @@ interface ChainConstant {
     double SOLIDIFIED_THRESHOLD = 0.7;
     int PRIVATE_KEY_LENGTH = 64;
     int MAX_ACTIVE_WITNESS_NUM = 27;
-    int TRXS_SIZE = 2_000_000; // < 2MiB
+    //int TRXS_SIZE = 2_000_000; // < 2MiB
+    int BLOCK_SIZE = 2_000_000;
     int BLOCK_PRODUCED_INTERVAL = 3000; //ms,produce block period, must be divisible by 60. millisecond
-    long CLOCK_MAX_DELAY = 3600 * 1000; //ms
+    long CLOCK_MAX_DELAY = 3600000; // 3600 * 1000 ms
     double BLOCK_PRODUCED_TIME_OUT = 0.75;
     long BATCH_FETCH_RESPONSE_SIZE = 1000; //for each inventory message from peer, the max count of fetch inv message
     long PRECISION = 1000_000;
     long ONE_DAY_NET_LIMIT = 57_600_000_000L;
-    long WINDOW_SIZE_MS = 24 * 3600 * 1000;
+    long WINDOW_SIZE_MS = 24 * 3600 * 1000L;
     long CREATE_NEW_ACCOUNT_COST = 10000;
   }
 
@@ -37,6 +38,7 @@ interface NodeConstant {
   }
 
   interface NetConstants {
+
     long GRPC_IDLE_TIME_OUT = 60000L;
     long ADV_TIME_OUT = 20000L;
     long SYNC_TIME_OUT = 5000L;
@@ -50,6 +52,7 @@ interface NetConstants {
   }
 
   interface DatabaseConstants {
+
     int TRANSACTIONS_COUNT_LIMIT_MAX = 1000;
   }
 }

src/main/java/org/tron/core/db/Manager.java

@@ -13,7 +13,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Formatter;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -434,19 +433,21 @@ void validateTapos(TransactionCapsule transactionCapsule) throws TaposException
       if (Arrays.equals(blockHash, refBlockHash)) {
         return;
       } else {
-        String str = new Formatter().format(
+        String str = String.format(
             "Tapos failed, different block hash, %s, %s , recent block %s, solid block %s head block %s",
             ByteArray.toLong(refBlockNumBytes), Hex.toHexString(refBlockHash),
             Hex.toHexString(blockHash),
             getSolidBlockId().getString(), getHeadBlockId().getString()).toString();
+        logger.info(str);
         throw new TaposException(str);
 
       }
     } catch (ItemNotFoundException e) {
-      String str = new Formatter().
+      String str = String.
           format("Tapos failed, block not found, ref block %s, %s , solid block %s head block %s",
               ByteArray.toLong(refBlockNumBytes), Hex.toHexString(refBlockHash),
               getSolidBlockId().getString(), getHeadBlockId().getString()).toString();
+      logger.info(str);
       throw new TaposException(str);
     }
   }
@@ -925,25 +926,22 @@ public synchronized BlockCapsule generateBlock(
 
     final BlockCapsule blockCapsule =
         new BlockCapsule(number + 1, preHash, when, witnessCapsule.getAddress());
-
+    currentTrxSize = blockCapsule.getInstance().getSerializedSize();
     dialog.reset();
     dialog.setValue(revokingStore.buildDialog());
-
     Iterator iterator = pendingTransactions.iterator();
     while (iterator.hasNext()) {
       TransactionCapsule trx = (TransactionCapsule) iterator.next();
-      currentTrxSize += trx.getSerializedSize();
-      // judge block size
-      if (currentTrxSize > ChainConstant.TRXS_SIZE) {
-        postponedTrxCount++;
-        continue;
-      }
-
       if (DateTime.now().getMillis() - when > ChainConstant.BLOCK_PRODUCED_INTERVAL * 0.5) {
         logger.debug("Processing transaction time exceeds the 50% producing time。");
         break;
       }
-
+      currentTrxSize += trx.getSerializedSize();
+      // check the block size
+      if (currentTrxSize + 2 > ChainConstant.BLOCK_SIZE) {
+        postponedTrxCount++;
+        continue;
+      }
       // apply transaction
       try (Dialog tmpDialog = revokingStore.buildDialog()) {
         processTransaction(trx);

src/main/java/org/tron/core/db/TransactionStore.java

@@ -50,10 +50,6 @@ public long getTotalTransactions() {
 
   private static TransactionStore instance;
 
-  public static void destory() {
-    instance = null;
-  }
-
   public static void destroy() {
     instance = null;
   }

src/main/java/org/tron/core/net/message/BlockMessage.java

@@ -1,5 +1,6 @@
 package org.tron.core.net.message;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.capsule.BlockCapsule.BlockId;
@@ -10,7 +11,7 @@ public class BlockMessage extends TronMessage {
 
   private Block block;
 
-  public BlockMessage(byte[] data) throws Exception {
+  public BlockMessage(byte[] data) throws InvalidProtocolBufferException {
     this.type = MessageTypes.BLOCK.asByte();
     this.data = data;
     this.block = Protocol.Block.parseFrom(data);
@@ -22,7 +23,7 @@ public BlockMessage(Block block) {
     this.data = block.toByteArray();
   }
 
-  public BlockMessage(BlockCapsule block) throws Exception {
+  public BlockMessage(BlockCapsule block) {
     data = block.getData();
     this.type = MessageTypes.BLOCK.asByte();
     this.block = block.getInstance();

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

@@ -18,7 +18,7 @@
 public interface NodeDelegate {
 
   LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boolean syncMode)
-      throws BadBlockException, UnLinkedBlockException;
+      throws BadBlockException, UnLinkedBlockException, InterruptedException;
 
   void handleTransaction(TransactionCapsule trx) throws BadTransactionException;
 

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

@@ -1,6 +1,7 @@
 package org.tron.core.net.node;
 
 import static org.tron.core.config.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
+import static org.tron.core.config.Parameter.ChainConstant.BLOCK_SIZE;
 
 import com.google.common.primitives.Longs;
 import java.util.ArrayList;
@@ -48,7 +49,12 @@ public NodeDelegateImpl(Manager dbManager) {
 
   @Override
   public synchronized LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boolean syncMode)
-      throws BadBlockException, UnLinkedBlockException {
+      throws BadBlockException, UnLinkedBlockException, InterruptedException {
+
+    if (block.getInstance().getSerializedSize() > BLOCK_SIZE + 100) {
+      throw new BadBlockException("block size over limit");
+    }
+
     // TODO timestamp shouble be consistent.
     long gap = block.getTimeStamp() - System.currentTimeMillis();
     if (gap >= BLOCK_PRODUCED_INTERVAL) {
@@ -77,8 +83,6 @@ public synchronized LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boole
       throw new BadBlockException("ContractValidate exception," + e.getMessage());
     } catch (ContractExeException e) {
       throw new BadBlockException("Contract Exectute exception," + e.getMessage());
-    } catch (InterruptedException e) {
-      throw new BadBlockException("pre validate signature exception," + e.getMessage());
     } catch (TaposException e) {
       throw new BadBlockException("tapos exception," + e.getMessage());
     } catch (DupTransactionException e) {

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

@@ -764,8 +764,8 @@ private void processAdvBlock(PeerConnection peer, BlockCapsule block) {
     //TODO: lack the complete flow.
     if (!freshBlockId.contains(block.getBlockId())) {
       try {
-        LinkedList<Sha256Hash> trxIds = del.handleBlock(block, false);
-
+        LinkedList<Sha256Hash> trxIds = null;
+        trxIds = del.handleBlock(block, false);
         freshBlockId.offer(block.getBlockId());
 
         trxIds.forEach(trxId -> advObjToFetch.remove(trxId));
@@ -786,18 +786,25 @@ private void processAdvBlock(PeerConnection peer, BlockCapsule block) {
             block.getBlockId().getString(), peer.getNode().getHost(),
             del.getHeadBlockId().getString());
         startSyncWithPeer(peer);
-      } catch (Exception e) {
-        logger.error("Fail to process adv block {} from {}", block.getBlockId().getString(),
-            peer.getNode().getHost(), e);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
       }
+
+      // logger.error("Fail to process adv block {} from {}", block.getBlockId().getString(),
+      // peer.getNode().getHost(), e);
+
     }
   }
 
   private boolean processSyncBlock(BlockCapsule block) {
     boolean isAccept = false;
     ReasonCode reason = null;
     try {
-      del.handleBlock(block, true);
+      try {
+        del.handleBlock(block, true);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+      }
       freshBlockId.offer(block.getBlockId());
       logger.info("Success handle block {}", block.getBlockId().getString());
       isAccept = true;