update change_log of v2.4.0 && update getNodeVesion output

part-blockchain · Apr 30, 2020 · 4f7f3a6 · 4f7f3a6
1 parent 7452915
commit 4f7f3a6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/docs/change_log/2_4_0.md b/docs/change_log/2_4_0.md
@@ -18,8 +18,7 @@
 - 支持[网络流量和Gas统计](../design/features/stat.md)
 - [Precompiled合约支持Gas](../design/virtual_machine/gas.html#precompiledgas)
 - [支持EVM Gas衡量标准插件化配置](../design/virtual_machine/gas.html#evm-gas)
-- 添加新接口[SendTransactionAndGetProof](../api.html#sendrawtransactionandgetproof)推送交易和交易回执证明
-
+- 添加新接口[sendRawTransactionAndGetProof](../api.html#sendrawtransactionandgetproof)推送交易回执、交易Merkle证明和交易回执Merkle证明
 
 **更新**
 

diff --git a/docs/installation.md b/docs/installation.md
@@ -141,9 +141,9 @@ tail -f nodes/127.0.0.1/node0/log/log*  | grep connected
 
 正常情况会不停地输出链接信息，从输出可以看出node0与另外3个节点有链接。
 ```bash
-info|2019-01-21 17:30:58.316769| [P2P][Service] heartBeat connected count,size=3
-info|2019-01-21 17:31:08.316922| [P2P][Service] heartBeat connected count,size=3
-info|2019-01-21 17:31:18.317105| [P2P][Service] heartBeat connected count,size=3
+info|2019-01-21 17:30:58.316769| [P2P][Service] heartBeat,connected count=3
+info|2019-01-21 17:31:08.316922| [P2P][Service] heartBeat,connected count=3
+info|2019-01-21 17:31:18.317105| [P2P][Service] heartBeat,connected count=3
 ```
 
 - 执行下面指令，检查是否在共识
@@ -230,13 +230,13 @@ Type 'help' or 'h' for help. Type 'quit' or 'q' to quit console.
 # 获取客户端版本
 [group:1]> getNodeVersion
 {
-    "Build Time":"20200331 07:12:25",
+    "Build Time":"20200430 03:22:53",
     "Build Type":"Linux/clang/Release",
     "Chain Id":"1",
-    "FISCO-BCOS Version":"2.3.0",
+    "FISCO-BCOS Version":"2.4.0",
     "Git Branch":"HEAD",
-    "Git Commit Hash":"b8b62664d1b1f0ad0489bc4b3833bf730deee492",
-    "Supported Version":"2.3.0"
+    "Git Commit Hash":"0d94de1e0f2dc7ce7d226dbd68001a4b43029cf6",
+    "Supported Version":"2.4.0"
 }
 # 获取节点链接信息
 [group:1]> getPeers

diff --git a/en/docs/change_log/2_4_0.md b/en/docs/change_log/2_4_0.md
@@ -19,17 +19,16 @@
 - Support [network traffic and Gas statistics](../design/features/stat.md)
 - [Precompiled contract supports Gas](../design/virtual_machine/gas.html#precompiled-contract-supports-gas-calculation)
 - [Support EVM Gas measurement standard plug-in configuration](../design/virtual_machine/gas.html#evm-gas-measurement-standard-plug-in)
-- Add new interface [SendTransactionAndGetProof](../api.html#sendrawtransactionandgetproof) push transaction and transaction receipt proof
+- Add new interface [sendRawTransactionAndGetProof](../api.html#sendrawtransactionandgetproof) push transaction and transaction receipt proof
 
 **Update**
 
 - The minimum requirement of CMake is modified to 3.7, supporting multi-source download of dependent libraries 
 
 **Fix**
 
-- Fix the problem that the ecRecover interface is not available in the national secret mode
-- Fix the inconsistent return value of sha256 interface in national secret mode and non-national secret mode
-
+- Fix the problem that the ecRecover interface is not available in the OSCCA-approved cryptography mode
+- Fix the inconsistent return value of sha256 interface in OSCCA-approved cryptography mode and non-OSCCA-approved cryptography mode
 
 **compatibility**
 

diff --git a/en/docs/installation.md b/en/docs/installation.md
@@ -146,9 +146,9 @@ tail -f nodes/127.0.0.1/node0/log/log*  | grep connected
 In normal situation, the connecting messages will be output continuously. From the output messages, we can see that node0 has links with the other three nodes.
 
 ```bash
-info|2019-01-21 17:30:58.316769| [P2P][Service] heartBeat connected count,size=3
-info|2019-01-21 17:31:08.316922| [P2P][Service] heartBeat connected count,size=3
-info|2019-01-21 17:31:18.317105| [P2P][Service] heartBeat connected count,size=3
+info|2019-01-21 17:30:58.316769| [P2P][Service] heartBeat,connected count=3
+info|2019-01-21 17:31:08.316922| [P2P][Service] heartBeat,connected count=3
+info|2019-01-21 17:31:18.317105| [P2P][Service] heartBeat,connected count=3
 ```
 
 - Execute the following command to check whether it is in consensus
@@ -234,13 +234,13 @@ Type 'help' or 'h' for help. Type 'quit' or 'q' to quit console.
 # acquire client ends version information
 [group:1]> getNodeVersion
 {
-    "Build Time":"20200331 07:12:25",
+    "Build Time":"20200430 03:22:53",
     "Build Type":"Linux/clang/Release",
     "Chain Id":"1",
-    "FISCO-BCOS Version":"2.3.0",
+    "FISCO-BCOS Version":"2.4.0",
     "Git Branch":"HEAD",
-    "Git Commit Hash":"b8b62664d1b1f0ad0489bc4b3833bf730deee492",
-    "Supported Version":"2.3.0"
+    "Git Commit Hash":"0d94de1e0f2dc7ce7d226dbd68001a4b43029cf6",
+    "Supported Version":"2.4.0"
 }
 # acquire node connection information
 [group:1]> getPeers