merge develop to master

.gitignore

@@ -13,6 +13,7 @@ gradlew.bat
 
 # log
 logs
+consensus-logs
 
 # lombok
 out

CONTRIBUTING.md

@@ -25,7 +25,7 @@ for us. We will appreciate it.
 ### Create issues
 
 Any significant improvement should be documented as [a GitHub
-issue](https://github.com/tron-network/java-tron/issues) before anybody
+issue](https://github.com/tronprotocol/java-tron/issues) before anybody
 starts working on it. 
 
 Also when filing an issue, make sure to answer these three questions:

README.md

@@ -1,5 +1,14 @@
-# What’s TRON? [![Build Status](https://www.travis-ci.org/tron-network/java-tron.svg?branch=develop)](https://www.travis-ci.org/tron-network/java-tron)
+<p align="center"><img width=27% src="https://github.com/tronprotocol/wiki/blob/master/images/tron.png"></p>
 
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+[![Build Status](https://travis-ci.org/tronprotocol/java-tron.svg?branch=feature%2Fconsensus)](https://travis-ci.org/tronprotocol/java-tron) 
+[![GitHub last commit](https://img.shields.io/github/last-commit/tronprotocol/java-tron.svg)](https://github.com/tronprotocol/java-tron/commits/develop) 
+[![GitHub issues](https://img.shields.io/github/issues/tronprotocol/java-tron.svg)](https://github.com/tronprotocol/java-tron/issues) 
+[![GitHub pull requests](https://img.shields.io/github/issues-pr/tronprotocol/java-tron.svg)](https://github.com/tronprotocol/java-tron/pulls)
+[![GitHub contributors](https://img.shields.io/github/contributors/tronprotocol/java-tron.svg)](https://github.com/tronprotocol/java-tron/graphs/contributors) 
+[![license](https://img.shields.io/github/license/tronprotocol/java-tron.svg)](LICENSE)
+
+# What's TRON?
 TRON is a block chain-based decentralized smart protocol and an application development platform. It allows each user to freely publish, store and own contents and data, and in the decentralized autonomous form, decides an incentive mechanism and enables application developers and content creators through digital asset distribution, circulation and transaction, thus forming a decentralized content entertainment ecosystem.
 
 TRON is a product of Web 4.0 and the decentralized internet of next generation.
@@ -9,29 +18,90 @@ TRON is a product of Web 4.0 and the decentralized internet of next generation.
 **Download and build**
 
 ```shell
-> git clone https://github.com/tron-network/java-tron.git
+> git clone https://github.com/tronprotocol/java-tron.git
 > cd java-tron
 > gradle build
 ```
 
 **Import project to IDEA**
 
-1. [File] -> [New] -> [Project from Existing Sources...]
-2. Select java-tron/build.gradle
-3. Dialog [Import Project from Gradle], confirm [Use auto-import] and [Use gradle wrapper task configuration] have been
+- [File] -> [New] -> [Project from Existing Sources...]
+- Select java-tron/build.gradle
+- Dialog [Import Project from Gradle], confirm [Use auto-import] and [Use gradle wrapper task configuration] have been
  selected，then select Gradle JVM（JDK 1.8）and click [OK]
 
 # Testing
 
-- Install Kafka, create two topics (block and transaction)
-- Adjust constant **DEFAULT_BOOTSTRAP_SERVERS** in ConsumerProperty.java file and ProducerProperty.java file to your Kafka's host（like：192.168.1.199:9092）
-- IDEA: [Edit Configurations...] -> [Program arguments]: **--type server**
-- Run Tron (server)
-- IDEA: [Edit Configurations...] -> [Program arguments]: **--type normal**
-- Run Tron (client)
-- Execute `help` command on the client
+**Install Kafka and create two topics (block and transaction)**
+
+**Update the configuration**
+
+File path: `<your workspace>/java-tron/src/main/resources/tron.conf`
+
+```yml
+kafka {
+    host = "127.0.0.1"  # your Kafka's host
+    port = ":9092"      # your Kafka's port
+}
+```
+
+**Starting program**
+
+IDEA: 
+- [Edit Configurations...] -> [Program arguments]: `--type server`
+- Run
+
+![run](https://github.com/tronprotocol/wiki/blob/master/images/show-how/run.gif)
+
+# Commands
+**help**
+
+| Description | Example |
+| --- | --- |
+| Help tips | `help` |
+
+![help](https://github.com/tronprotocol/wiki/blob/master/images/commands/help.gif)
+
+**account**
+
+| Description | Example |
+| --- | --- |
+| Get address | `account` |
+
+![help](https://github.com/tronprotocol/wiki/blob/master/images/commands/account.gif)
+
+**getbalance**
+
+| Description | Example |
+| --- | --- |
+| Get balance | `getbalance` |
+
+![help](https://github.com/tronprotocol/wiki/blob/master/images/commands/getbalance.gif)
+
+**send [to] [balance]**
+
+| Description | Example |
+| --- | --- |
+| Send balance to address | `send 2cddf5707aefefb199cb16430fb0f6220d460dfe 2` |
+
+![help](https://github.com/tronprotocol/wiki/blob/master/images/commands/send.gif)
+
+**printblockchain**
+
+| Description | Example |
+| --- | --- |
+| Print blockchain | `printblockchain` |
+
+![help](https://github.com/tronprotocol/wiki/blob/master/images/commands/printblockchain.gif)
+
+**exit**
+
+| Description | Example |
+| --- | --- |
+| Exit | `exit` |
 
-# License
+![help](https://github.com/tronprotocol/wiki/blob/master/images/commands/exit.gif)
 
-java-tron is released under the [LGPL-V3 license](LICENSE).
+# Contribution
+Contributions are welcomed and greatly appreciated. Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details on submitting patches and the contribution workflow.
 

build.gradle

@@ -73,6 +73,7 @@ dependencies {
     compile group: 'io.atomix.copycat', name: 'copycat-server', version: '1.1.4'
     compile group: 'io.atomix.copycat', name: 'copycat-client', version: '1.1.4'
     compile group: 'io.atomix.catalyst', name: 'catalyst-netty', version: '1.1.1'
+    compile group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
 }
 
 tasks.matching { it instanceof Test }.all {

src/main/java/org/tron/command/AccountCommand.java

@@ -1,3 +1,17 @@
+/*
+ * java-tron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * java-tron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.tron.command;
 
 import org.tron.peer.Peer;

src/main/java/org/tron/command/Cli.java

@@ -1,3 +1,17 @@
+/*
+ * java-tron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * java-tron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.tron.command;
 
 import org.tron.peer.Peer;
@@ -42,6 +56,16 @@ public void run(Peer peer) {
                 case "printblockchain":
                     new PrintBlockchainCommand().execute(peer, cmdParameters);
                     break;
+
+                case "consensus":
+                    new ConsensusCommand().server();
+                    break;
+                case "getmessage":
+                    new ConsensusCommand().getClient(cmdParameters);
+                    break;
+                case "putmessage":
+                    new ConsensusCommand().putClient(cmdParameters);
+                    break;
                 case "help":
                 default:
                     new HelpCommand().execute(peer, cmdParameters);

src/main/java/org/tron/command/Command.java

@@ -1,3 +1,17 @@
+/*
+ * java-tron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * java-tron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.tron.command;
 
 import org.tron.peer.Peer;

src/main/java/org/tron/command/ConsensusCommand.java

@@ -0,0 +1,58 @@
+/*
+ * java-tron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * java-tron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.tron.command;
+
+import org.tron.consensus.client.Client;
+import org.tron.consensus.server.Server;
+
+public class ConsensusCommand {
+
+    public ConsensusCommand() {
+
+    }
+
+    public void server() {
+        Server.serverRun();
+    }
+
+    public void putClient(String[] args) {
+        Client.putMessage(args);
+    }
+
+    public void getClient(String[] args) {
+        Client.getMessage(args[0]);
+    }
+
+    public void usage() {
+        System.out.println("");
+        System.out.println("consensus server");
+        System.out.println("Command: consensus");
+        System.out.println("Description: Create a server.");
+        System.out.println("");
+
+        System.out.println("");
+        System.out.println("get Message");
+        System.out.println("Command: getmessage [key]");
+        System.out.println("Description: Get consensus Message");
+        System.out.println("");
+
+        System.out.println("");
+        System.out.println("put Message");
+        System.out.println("Command: putmessage [key] [value]");
+        System.out.println("Description: Put a consensus Message");
+        System.out.println("");
+    }
+
+}

src/main/java/org/tron/command/ExitCommand.java

@@ -1,3 +1,17 @@
+/*
+ * java-tron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * java-tron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.tron.command;
 
 import org.tron.peer.Peer;

src/main/java/org/tron/command/GetBalanceCommand.java

@@ -1,3 +1,17 @@
+/*
+ * java-tron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * java-tron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.tron.command;
 
 import org.tron.peer.Peer;

src/main/java/org/tron/command/HelpCommand.java

@@ -1,3 +1,17 @@
+/*
+ * java-tron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * java-tron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.tron.command;
 
 import org.tron.peer.Peer;
@@ -13,6 +27,7 @@ public void execute(Peer peer, String[] parameters) {
         new GetBalanceCommand().usage();
         new AccountCommand().usage();
         new PrintBlockchainCommand().usage();
+        new ConsensusCommand().usage();
     }
 
     @Override

src/main/java/org/tron/command/PrintBlockchainCommand.java

@@ -1,3 +1,17 @@
+/*
+ * java-tron is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * java-tron is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.tron.command;
 
 import org.tron.core.BlockUtils;