add docs imags

Author: zonLi

docs/Official_Public_Node.md

@@ -1,4 +1,4 @@
-# Full Node
+# FullNodes
 * GRPC port: 50051
 * P2P network port: 18888
 * HTTP port : 8090
@@ -35,7 +35,7 @@
 47.75.249.4
 ```
 
-# Solidity Node
+# SolidityNodes
 * GRPC port: 50051
 * HTTP port : 8091
 ```

docs/SolidityNode&FullNode_Deployment.md

@@ -0,0 +1,93 @@
+# SolidityNode and FullNode Deployment on The Same Host
+
+Create separate directories for fullnode and soliditynode
+```text
+/deploy/fullnode
+/deploy/soliditynode
+```
+
+Create two folders for fullnode and soliditynode.
+
+Clone the latest master branch of [https://github.com/tronprotocol/java-tron](https://github.com/tronprotocol/java-tron) and extract it to
+```text      
+/deploy/java-tron 
+```
+
+Make sure you have the proper dependencies.
+
+* JDK 1.8 (JDK 1.9+ is 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.
+* Open **UDP** ports for connection to the network
+* **MINIMUM** 2 CPU Cores
+
+## Deployment Guide
+
+1. Build the java-tron project  
+```text
+cd /deploy/java-tron 
+./gradlew build
+```
+
+2. Copy the FullNode.jar and SolidityNode.jar along with configuration files into the respective directories
+```text
+download your needed configuration file from https://github.com/tronprotocol/TronDeployment.  
+
+main_net_config.conf is the configuration for MainNet, and test_net_config.conf is the configuration for TestNet.  
+
+please rename the configuration file to `config.conf` and use this config.conf to start FullNode and SoliditNode.  
+
+cp build/libs/FullNode.jar ../fullnode  
+
+cp build/libs/SolidityNode.jar ../soliditynode
+```
+
+3. You can now run your FullNode using the following command
+```text
+java -jar FullNode.jar -c config.conf // make sure that your config.conf is downloaded from https://github.com/tronprotocol/TronDeployment
+```
+
+4. Configure the SolidityNode configuration file  
+
+You need to edit `config.conf` to connect to your local FullNode. Change  `trustNode` in `node` to local `127.0.0.1:50051`, which is the default rpc port. Set `listen.port` to any number within the range of 1024-65535. Please don't use any ports between 0-1024 since you'll most likely hit conflicts with other system services. Also change `rpc port` to `50052` or something to avoid conflicts. **Please forward the UDP port 18888 for FullNode.**
+```text
+rpc {
+      port = 50052
+    }
+```
+
+5. You can now run your SolidityNode using the following command：
+```text        
+java -jar SolidityNode.jar -c config.conf //make sure that your config.conf is downloaded from https://github.com/tronprotocol/TronDeployment
+```
+
+# Logging and Network Connection Verification
+
+Logs for both nodes are located in `/deploy/\*/logs/tron.log`. Use `tail -f /logs/tron.log/` to follow along with the block syncing.
+
+You should see something similar to this in your logs for block synchronization:
+
+**FullNode**
+```text
+12:00:57.658 INFO  [pool-7-thread-1] [o.t.c.n.n.NodeImpl](NodeImpl.java:830) Success handle block Num:236610,ID:0000000000039c427569efa27cc2493c1fff243cc1515aa6665c617c45d2e1bf
+```
+**SolidityNode**
+```text
+12:00:40.691 INFO  [pool-17-thread-1] [o.t.p.SolidityNode](SolidityNode.java:88) sync solidity block, lastSolidityBlockNum:209671, remoteLastSolidityBlockNum:211823
+```
+# Stop Node Gracefully
+Create file stop.sh，use kill -15 to close java-tron.jar（or FullNode.jar、SolidityNode.jar）.
+You need to modify pid=`ps -ef |grep java-tron.jar |grep -v grep |awk '{print $2}'` to find the correct pid.
+```text
+#!/bin/bash
+while true; do
+  pid=`ps -ef |grep java-tron.jar |grep -v grep |awk '{print $2}'`
+  if [ -n "$pid" ]; then
+    kill -15 $pid
+    echo "The java-tron process is exiting, it may take some time, forcing the exit may cause damage to the database, please wait patiently..."
+    sleep 1
+  else
+    echo "java-tron killed successfully!"
+    break
+  fi
+done
+```

docs/Solidity_and_Full_Node_Deployment_EN.md

@@ -29,7 +29,7 @@ The following interfaces are available in Tron Wallet-CLI:
  + getcontract(contractAddress)
 Developers can call these interfaces to deploy, trigger or check smart contracts.
 
-## How TVM works
+## How TVM Works
 
 ![Flowchart of Tron Virtual Machine](https://raw.githubusercontent.com/ybhgenius/Documentation/master/images/Virtual_Machine/虚拟机.png)
 
@@ -41,7 +41,7 @@ Put simply, the flow is as follows:
 + A virtual machine processes data through opcode, which is equivalent to operating a logic of a stack-based finite state machine.
 + TVM accesses blockchain data and invoke External Data Interface through the Interoperation layer.
 
-## Future development of TVM
+## Future Development of TVM
 1. More developer-friendly debugging tools   
 
 Tron will be committed to the development of optimized debugging tools and the establishment of standardized symbol and data format, for improved developer efficiency.  
@@ -54,7 +54,7 @@ Different from gas consumption mechanism for every transaction on EVM, there is
 
 Improving JIT compilation speed is conducive to faster interpretation and optimized compilation of local code. Meanwhile, Tron is planning to further optimize its TVM based on WebAssembly (WASM). WebAssembly, spearheaded by Apple, Google, Microsoft and Mozilla, is designed to break bottlenecks of current Web browsers and can be generated through compiling C/C++ and other programming languages. Integrating WASM, TVM will be able to provide high performance and high throughput for blockchain to cope with complex scenarios.
 
-## The following is a guide to TVM (smart contract deployment)
+## Usage Guide to TVM 
 
 1. Compile contract  
 

docs/Tron-VM.md

@@ -1,5 +1,5 @@
 #  TRON Built-in Http Introduction
-## hexString and base58check transcode demo
+## HexString and Base58check Transcode Demo
 JAVA:  
 [https://github.com/tronprotocol/wallet-cli/blob/master/src/main/java/org/tron/demo/TransactionSignDemo.java#L92](https://github.com/tronprotocol/wallet-cli/blob/master/src/main/java/org/tron/demo/TransactionSignDemo.java#L92)   
 PHP:  

docs/Tron-http.md

@@ -120,10 +120,11 @@ For more api detail, please refer to [Tron-http](Tron-http.md)
 
 TRON uses account model. An account's identity is address, it needs private key signature to operate an account. An account has many attributes, like TRX balance, tokens balance, bandwidth, etc. TRX and tokens can be transfered from account to account and it costs bandwidth. An account can also issue a smart contract, apply to become a super representative candidate, vote, etc. All TRON's activities are based on account.
 
-## 3.2 Way to Create an Account
+## 3.2 How to Create an Account
 
-1. Use a wallet to generate the address and private key. To active the account, you need to transfer TRX or transfer token to the new created account.  
-2. Use an account already existed in TRON network to create an account   
+1. Use a wallet to generate the address and private key. To active the account, you need to transfer TRX or transfer token to the new created account. [generate an account](https://tronscan.org/#/wallet/new)
+
+2. Use an account already existed in TRON network to create an account   
 
 ## 3.3 Key-pair Generation Algorithm
 Tron signature algorithm is ECDSA, curve used is SECP256K1. Private key is a random bumber, public key is a point in the elliptic curve. The process is: first generate a random number d to be the private key, then caculate P = d * G as the public key, G is the elliptic curve base point.
@@ -138,7 +139,8 @@ ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
 
 ## 3.5 Signature
 Signature introduction, please refer to:  
-https://github.com/tronprotocol/Documentation/blob/fix_http/%E4%B8%AD%E6%96%87%E6%96%87%E6%A1%A3/%E4%BA%A4%E6%98%93%E7%AD%BE%E5%90%8D%E6%B5%81%E7%A8%8B.md
+[https://github.com/tronprotocol/Documentation/blob/fix_http/%E4%B8%AD%E6%96%87%E6%96%87%E6%A1%A3/%E4%BA%A4%E6%98%93%E7%AD%BE%E5%90%8D%E6%B5%81%E7%A8%8B.md]( 
+https://github.com/tronprotocol/Documentation/blob/fix_http/%E4%B8%AD%E6%96%87%E6%96%87%E6%A1%A3/%E4%BA%A4%E6%98%93%E7%AD%BE%E5%90%8D%E6%B5%81%E7%A8%8B.md)
 
 # 4 TRON Network Node
 ## 4.1 SuperNode

docs/Tron-overview.md

@@ -1,17 +1,33 @@
-# Welcome to MkDocs
+# Documentation Guide
 
-For full documentation visit [mkdocs.org](https://mkdocs.org).
+**Please visit the new [TRON Developers Hub](https://developers.tron.network/) for detailed guides, interactive APIs, and much more!**
 
-## Commands
++ If you want to know more about the recent progress of the TRON project, please check out [TRON Introduction](https://github.com/tronprotocol/Documentation/tree/master/English_Documentation/TRON_Introduction).  
++ If you want to know more about the protocol documentation, please check out [TRON Protocol](https://github.com/tronprotocol/Documentation/tree/master/English_Documentation/TRON_Protocol).  
++ If you want to know more about the SR information, vote, or token creation, please check out [TRON blockchain explorer](https://github.com/tronprotocol/Documentation/tree/master/English_Documentation/TRON_Blockchain_Explorer). 
++ If you want to know more about TRON Wallet, please check out [Android Wallet](https://github.com/tronprotocol/Documentation/blob/master/English_Documentation/Android_Wallet/Guide_to_Android_Wallet.md).
++ If you want to know more about the programming contest, please check out [TRON programming contest](https://github.com/tronprotocol/Documentation/tree/master/English_Documentation/TRON_Programming_Contest).
++ If you want to know more about the TRX migration, please check out [TRX](https://github.com/tronprotocol/Documentation/tree/master/TRX).
++ For more information about Virtual Machine, please check out [TVM](https://github.com/tronprotocol/Documentation/blob/master/English_Documentation/TRON_Virtual_Machine/Virtual_Machine_Introduction.md).
++ For latest process of TRON, please follow the [TRON documentation](https://github.com/tronprotocol/Documentation/tree/master/English_Documentation).
+
+
+
+
+
+
+# 文档
+
+# 文档指引
+
++ 如果你想了解波场的发展进程以及最新动态，请查看[波场介绍](https://github.com/tronprotocol/Documentation/tree/master/中文文档/波场介绍)相关文档。  
++ 如果你想了解波场的相关技术协议，请查看[波场协议](https://github.com/tronprotocol/Documentation/tree/master/中文文档/波场协议)相关文档。
++ 如果你想了解有关超级节点、投票和发行资产的相关信息，请查看[波场区块链浏览器](https://github.com/tronprotocol/Documentation/tree/master/中文文档/波场区块链浏览器介绍)。
++ 如果你想了解关于波场钱包的相关信息，请查看[Android钱包使用指导](https://github.com/tronprotocol/Documentation/blob/master/中文文档/Android钱包/Android钱包使用指导.md)。
++ 如果你想了解编程大赛，请查看[波场编程大赛](https://github.com/tronprotocol/Documentation/tree/master/中文文档/波场编程大赛)。
++ 如果你想了解波场TRX迁移，请查看[TRX](https://github.com/tronprotocol/Documentation/tree/master/TRX)相关文档。
++ 对于波场虚拟机的更多信息，请查看[TVM](https://github.com/tronprotocol/Documentation/blob/master/English_Documentation/TRON_Virtual_Machine/Virtual_Machine_Introduction.md)相关文档。
++ 对于波场发展的最新进展，请时刻关注[波场文档](https://github.com/tronprotocol/Documentation/tree/master/中文文档)。
 
-* `mkdocs new [dir-name]` - Create a new project.
-* `mkdocs serve` - Start the live-reloading docs server.
-* `mkdocs build` - Build the documentation site.
-* `mkdocs help` - Print this help message.
 
-## Project layout
 
-    mkdocs.yml    # The configuration file.
-    docs/
-        index.md  # The documentation homepage.
-        ...       # Other markdown pages, images and other files.

docs/index.md

@@ -5,5 +5,6 @@ nav:
     - TRON Http Api: Tron-http.md
     - TRON RPC Api: Tron-rpc.md
     - TRON Official Public Nodes: Official_Public_Node.md
-    - TRON Virtual Mmachine: Tron-VM.md
+    - TRON Virtual Machine: Tron-VM.md
+    - TRON Deployment: SolidityNode&FullNode_Deployment.md
 theme: readthedocs