Merge branch 'develop' into master

Author: olenheim

.gitignore

@@ -51,3 +51,4 @@ src/main/resources/META-INF/
 /output_witness/
 output*
 nodeId.properties
+Wallet

README.md

@@ -63,7 +63,7 @@ TRON Protocol and the TVM allow anyone to develop DAPPs for themselves or their
 * JDK 1.8 (JDK 1.9+ are not supported yet)
 * On Linux Ubuntu system (e.g. Ubuntu 16.04.4 LTS), ensure that the machine has [__Oracle JDK 8__](https://www.digitalocean.com/community/tutorials/how-to-install-java-with-apt-get-on-ubuntu-16-04), instead of having __Open JDK 8__ in the system. If you are building the source code by using __Open JDK 8__, you will get [__Build Failed__](https://github.com/tronprotocol/java-tron/issues/337) result.
 
-## Getting the code
+## Getting the code with git
 
 * Use Git from the Terminal, see the [Setting up Git](https://help.github.com/articles/set-up-git/) and [Fork a Repo](https://help.github.com/articles/fork-a-repo/) articles.
 * develop branch: the newnest code 
@@ -78,6 +78,42 @@ git checkout -t origin/master
 
 * If you'd rather not use Git, [Download the ZIP](https://github.com/tronprotocol/java-tron/archive/develop.zip)
 
+## Including java-tron as dependency
+
+* If you don't want to checkout the code and build the project, you can include it directly as a dependency
+
+**Using gradle:**
+
+```
+repositories {
+   maven { url 'https://jitpack.io' }
+}
+dependencies {
+   implementation 'com.github.tronprotocol:java-tron:develop-SNAPSHOT'
+}
+```
+  
+**Using maven:**
+
+```xml
+...
+<repositories>
+  <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+  </repository>
+</repositories>
+...
+<dependency>
+    <groupId>com.github.tronprotocol</groupId>
+    <artifactId>java-tron</artifactId>
+    <version>develop-SNAPSHOT</version><!--You can use any of the tag/branch name available-->
+</dependency>
+```
+
+
+
+
 ## Building from source code
 
 * Build in the Terminal
@@ -477,6 +513,10 @@ Then observe whether block synchronization success，If synchronization successf
 
 Read the [Quick Start](http://wiki.tron.network/en/latest/Quick_Start.html).
 
+# Advanced Configurations
+
+Read the [Advanced Configurations](src/main/java/org/tron/core/config/README.md).
+
 # Community
 
 * [Slack](https://join.slack.com/t/tronfoundation/shared_invite/enQtMzAzNzg4NTI4NDM3LTAyZGQzMzEzMjNkNDU0ZjNkNTA4OTYyNTA5YWZmYjE3MTEyOWZhNzljNzQwODM3NDQ0OWRiMTIyMDhlYzgyOGQ)

build.gradle

@@ -22,11 +22,29 @@ apply plugin: 'application'
 apply plugin: 'checkstyle'
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "jacoco"
+apply plugin: 'maven-publish'
 
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 mainClassName = 'org.tron.program.FullNode'
 
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact sourceJar
+        }
+    }
+    repositories {
+        mavenLocal()
+    }
+}
+
+task sourceJar(type: Jar, dependsOn: classes) {
+    classifier 'sources'
+    from sourceSets.main.allSource
+}
+
 repositories {
     maven { url 'http://mvnrepository.com' }
     mavenLocal()
@@ -268,8 +286,8 @@ def binaryRelease(taskName, jarName, mainClass) {
     }
 }
 
-
 artifacts {
     archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'),
-            binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'))
-}
+            binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'),
+            binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'org.tron.program.KeystoreFactory'))
+}

jitpack.yml

@@ -0,0 +1,2 @@
+install:
+   - ./gradlew build publishToMavenLocal -x test

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

@@ -121,10 +121,11 @@ private void createWitness(final WitnessCreateContract witnessCreateContract)
         .get(witnessCapsule.createDbKey());
     accountCapsule.setIsWitness(true);
     this.dbManager.getAccountStore().put(accountCapsule.createDbKey(), accountCapsule);
-    dbManager.adjustBalance(witnessCreateContract.getOwnerAddress().toByteArray(),
-        -dbManager.getDynamicPropertiesStore().getAccountUpgradeCost());
+    long cost = dbManager.getDynamicPropertiesStore().getAccountUpgradeCost();
+    dbManager.adjustBalance(witnessCreateContract.getOwnerAddress().toByteArray(), -cost);
 
-    dbManager.adjustBalance(this.dbManager.getAccountStore().getBlackhole().createDbKey(),
-        +dbManager.getDynamicPropertiesStore().getAccountUpgradeCost());
+    dbManager.adjustBalance(this.dbManager.getAccountStore().getBlackhole().createDbKey(), +cost);
+
+    dbManager.getDynamicPropertiesStore().addTotalCreateWitnessCost(cost);
   }
 }

src/main/java/org/tron/core/config/README.md

@@ -0,0 +1,81 @@
+# Advanced Configurations
+
+we provide some configuration items for LevelDB and gRPC in `config.conf` file, for fine-grained performance tuning.   
+You may custom these items only if you have deep understanding on them, otherwise keep them as default.
+
+## LevelDB
+
+You can custom LevelDB options in the `storage` part of `config.conf`, which looks like:
+
+```
+storage {
+  # Directory for storing persistent data
+
+  db.directory = "database",
+  index.directory = "index",
+
+  # You can custom these 14 databases' configs:
+
+  # account, account-index, asset-issue, block, block-index,
+  # block_KDB, peers, properties, recent-block, trans,
+  # utxo, votes, witness, witness_schedule.
+
+  # Otherwise, db configs will remain defualt and data will be stored in
+  # the path of "output-directory" or which is set by "-d" ("--output-directory").
+
+  # Attention: name is a required field that must be set !!!
+  properties = [
+    {
+      name = "account",
+      path = "/path/to/accout",   // relative or absolute path
+      createIfMissing = true,
+      paranoidChecks = true,
+      verifyChecksums = true,
+      compressionType = 1,        // 0 - no compression,  1 - compressed with snappy
+      blockSize = 4096,           // 4  KB =         4 * 1024 B
+      writeBufferSize = 10485760, // 10 MB = 10 * 1024 * 1024 B
+      cacheSize = 10485760,       // 10 MB = 10 * 1024 * 1024 B
+      maxOpenFiles = 100
+    }
+  ]
+
+}
+
+```
+
+As shown in the example above, the data of database `accout` will be stored in the path of `/path/to/accout/database` while the index be stored in `/path/to/accout/index`. And, the example also shows our default value of LevelDB options from `createIfMissing` to `maxOpenFiles`. You can just refer to the docs of [LevelDB](https://github.com/google/leveldb/blob/master/doc/index.md#performance) to figure out details of these options.
+
+## gRPC
+
+You can custom gPRC options in the `node.rpc` part of `config.conf`, which looks like:
+
+```
+node {
+  rpc {
+    port = 50051
+
+    # Number of gRPC thread, default availableProcessors / 2
+    # thread = 16
+
+    # The maximum number of concurrent calls permitted for each incoming connection
+    # maxConcurrentCallsPerConnection =
+
+    # The HTTP/2 flow control window, default 1MB
+    # flowControlWindow =
+
+    # Connection being idle for longer than which will be gracefully terminated
+    maxConnectionIdleInMillis = 60000
+
+    # Connection lasting longer than which will be gracefully terminated
+    # maxConnectionAgeInMillis =
+
+    # The maximum message size allowed to be received on the server, default 4MB
+    # maxMessageSize =
+
+    # The maximum size of header list allowed to be received, default 8192
+    # maxHeaderListSize =
+  }
+}
+```
+
+You may refer to the source code of `io.grpc.netty.NettyServerBuilder` class to see details or just make a decision according to the brief comments above.  

src/main/java/org/tron/core/config/args/Account.java

@@ -17,9 +17,12 @@
 
 import com.google.protobuf.ByteString;
 import java.io.Serializable;
+import java.util.Arrays;
+
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 import org.tron.common.utils.ByteArray;
+import org.tron.common.utils.StringUtil;
 import org.tron.core.Wallet;
 import org.tron.protos.Protocol.AccountType;
 
@@ -49,7 +52,7 @@ public class Account implements Serializable {
   public void setAddress(final byte[] address) {
     if (!Wallet.addressValid(address)){
       throw new IllegalArgumentException(
-          "The address(" + address + ") must be a 21 bytes.");
+          "The address(" + StringUtil.createReadableString(address) + ") must be a 21 bytes.");
     }
     this.address = address;
   }

src/main/java/org/tron/core/config/args/Args.java

@@ -4,6 +4,7 @@
 import com.beust.jcommander.Parameter;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigObject;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -21,6 +22,9 @@
 import java.util.Optional;
 import java.util.Properties;
 import java.util.stream.Collectors;
+
+import io.grpc.internal.GrpcUtil;
+import io.grpc.netty.NettyServerBuilder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -32,10 +36,14 @@
 import org.tron.common.crypto.ECKey;
 import org.tron.common.overlay.discover.Node;
 import org.tron.core.Constant;
+import org.tron.common.utils.ByteArray;
 import org.tron.core.Wallet;
 import org.tron.core.config.Configuration;
 import org.tron.core.config.Parameter.ChainConstant;
 import org.tron.core.db.AccountStore;
+import org.tron.keystore.CipherException;
+import org.tron.keystore.Credentials;
+import org.tron.keystore.WalletUtils;
 
 @Slf4j
 @NoArgsConstructor
@@ -170,6 +178,30 @@ public class Args {
   @Parameter(names = {"--rpc-thread"}, description = "Num of gRPC thread")
   private int rpcThreadNum;
 
+  @Getter
+  @Setter
+  private int maxConcurrentCallsPerConnection;
+
+  @Getter
+  @Setter
+  private int flowControlWindow;
+
+  @Getter
+  @Setter
+  private long maxConnectionIdleInMillis;
+
+  @Getter
+  @Setter
+  private long maxConnectionAgeInMillis;
+
+  @Getter
+  @Setter
+  private int maxMessageSize;
+
+  @Getter
+  @Setter
+  private int maxHeaderListSize;
+
   @Getter
   @Setter
   @Parameter(names = {"--validate-sign-thread"}, description = "Num of validate thread")
@@ -252,7 +284,6 @@ public static void setParam(final String[] args, final String confFileName) {
       INSTANCE.setLocalWitnesses(new LocalWitnesses(INSTANCE.privateKey));
       logger.debug("Got privateKey from cmd");
     } else if (config.hasPath("localwitness")) {
-
       INSTANCE.localWitnesses = new LocalWitnesses();
       List<String> localwitness = config.getStringList("localwitness");
       if (localwitness.size() > 1) {
@@ -261,6 +292,30 @@ public static void setParam(final String[] args, final String confFileName) {
       }
       INSTANCE.localWitnesses.setPrivateKeys(localwitness);
       logger.debug("Got privateKey from config.conf");
+    } else if (config.hasPath("localwitnesskeystore")) {
+      INSTANCE.localWitnesses = new LocalWitnesses();
+      List<String> privateKeys = new ArrayList<String>();
+      if (INSTANCE.isWitness()) {
+        List<String> localwitness = config.getStringList("localwitnesskeystore");
+        if (localwitness.size() > 0) {
+          String fileName = System.getProperty("user.dir") + "/" + localwitness.get(0);
+          System.out.println("Please input your password.");
+          String password = WalletUtils.inputPassword();
+          try {
+            Credentials credentials = WalletUtils
+                .loadCredentials(password, new File(fileName));
+            ECKey ecKeyPair = credentials.getEcKeyPair();
+            String prikey = ByteArray.toHexString(ecKeyPair.getPrivKeyBytes());
+            privateKeys.add(prikey);
+          } catch (IOException e) {
+            logger.warn(e.getMessage());
+          } catch (CipherException e) {
+            logger.warn(e.getMessage());
+          }
+        }
+      }
+      INSTANCE.localWitnesses.setPrivateKeys(privateKeys);
+      logger.debug("Got privateKey from keystore");
     }
 
     if (INSTANCE.isWitness() && CollectionUtils.isEmpty(INSTANCE.localWitnesses.getPrivateKeys())) {
@@ -270,11 +325,11 @@ public static void setParam(final String[] args, final String confFileName) {
     INSTANCE.storage = new Storage();
     INSTANCE.storage.setDbDirectory(Optional.ofNullable(INSTANCE.storageDbDirectory)
         .filter(StringUtils::isNotEmpty)
-        .orElse(config.getString("storage.db.directory")));
+        .orElse(Storage.getDbDirectoryFromConfig(config)));
 
     INSTANCE.storage.setIndexDirectory(Optional.ofNullable(INSTANCE.storageIndexDirectory)
         .filter(StringUtils::isNotEmpty)
-        .orElse(config.getString("storage.index.directory")));
+        .orElse(Storage.getIndexDirectoryFromConfig(config)));
 
     INSTANCE.storage.setPropertyMapFromConfig(config);
 
@@ -360,6 +415,24 @@ public static void setParam(final String[] args, final String confFileName) {
         config.hasPath("node.rpc.thread") ? config.getInt("node.rpc.thread")
             : Runtime.getRuntime().availableProcessors() / 2;
 
+    INSTANCE.maxConcurrentCallsPerConnection = config.hasPath("node.rpc.maxConcurrentCallsPerConnection") ?
+        config.getInt("node.rpc.maxConcurrentCallsPerConnection") : Integer.MAX_VALUE;
+
+    INSTANCE.flowControlWindow = config.hasPath("node.rpc.flowControlWindow") ?
+        config.getInt("node.rpc.flowControlWindow") : NettyServerBuilder.DEFAULT_FLOW_CONTROL_WINDOW;
+
+    INSTANCE.maxConnectionIdleInMillis = config.hasPath("node.rpc.maxConnectionIdleInMillis") ?
+        config.getLong("node.rpc.maxConnectionIdleInMillis") : Long.MAX_VALUE;
+
+    INSTANCE.maxConnectionAgeInMillis = config.hasPath("node.rpc.maxConnectionAgeInMillis") ?
+        config.getLong("node.rpc.maxConnectionAgeInMillis") : Long.MAX_VALUE;
+
+    INSTANCE.maxMessageSize = config.hasPath("node.rpc.maxMessageSize") ?
+        config.getInt("node.rpc.maxMessageSize") : GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE;
+
+    INSTANCE.maxHeaderListSize = config.hasPath("node.rpc.maxHeaderListSize") ?
+        config.getInt("node.rpc.maxHeaderListSize") : GrpcUtil.DEFAULT_MAX_HEADER_LIST_SIZE;
+
     INSTANCE.maintenanceTimeInterval =
         config.hasPath("block.maintenanceTimeInterval") ? config
             .getInt("block.maintenanceTimeInterval") : 21600000L;