Merge pull request #1786 from wenlinlee/v3.6.1

add 3_6_1.md doc and update download version
FISCO-BCOS · Mar 11, 2024 · d49e1c2 · d49e1c2
2 parents 4933bea + dbf8861
commit d49e1c2
Show file tree

Hide file tree

Showing 23 changed files with 1,024 additions and 52 deletions.
diff --git a/3.x/zh_CN/docs/introduction/change_log/3_6_1.md b/3.x/zh_CN/docs/introduction/change_log/3_6_1.md
@@ -0,0 +1,95 @@
+# v3.6.1
+
+#### 修复
+
+* [修复DagTransfer的兼容问题](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4245)
+* [开启网络层限流](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4241)
+* [修复keyPage哈希不一致的兼容问题](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4230)
+* [internalCreate复用现有部署合约逻辑](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4243)
+
+
+* 历史版本升级
+
+  需要升级的链的“数据兼容版本号（[compatibility_version](#id5)）”为如下版本时：
+
+  * 3.4.x、3.5.x，3.6.x：数据完全兼容当前版本，直接替换二进制即可完成升级
+  *
+  3.3.x、3.2.x、3.1.x、3.0.x：支持通过替换二进制进行灰度升级，若需使用当前版本的新特性，需升级数据兼容版本号，操作见[文档](#id5)
+  * 3.0-rc x：数据不兼容，无法升级，可考虑逐步将业务迁移至3.x正式版
+  * 2.x：数据不兼容，2.x版本仍持续维护，可考虑升级为2.x的最新版本
+
+
+* 开启实验功能
+
+  效果：通过feature开关控制实验功能的开启
+
+  操作：升级节点可执行程序后，通过控制台命令`setSystemConfigByKey <feature名> 1` 开启对应实验功能，具体操作见文档升级方法部分
+
+  注意事项：
+  * feature操作不可逆，打开后不可关闭
+  * 需确认所有可执行程序版本相同后，再进行feature开启操作
+
+|           | Feature 名                  | 默认状态 | 说明                                         |
+|-----------|----------------------------|------|--------------------------------------------|
+| 资产管理      | feature_balance            | 关：0  | 默认关闭                                       |
+| 资产操作预编译合约 | feature_balance_precompile | 关：0  | 默认关闭                                       |
+| 计费模式      | feature_policy1            | 关：0  | 默认关闭                                       |
+| 块内分片      | feature_sharding           | 关：0  | 默认关闭，仅在从3.3、3.4升级至当前版本时，feature_sharding打开 |
+| 同态加密      | feature_paillier           | 关：0  | 默认关闭                                       |
+| rpbft共识   | feature_rpbft              | 关：0  | 默认关闭                                       |
+| bug修复     | bugfix_\<bug_name\>        | 开：1  | 从低版本升级默认关闭                                 |
+
+**组件兼容性**
+
+|            | 推荐版本        | 最低版本                | 说明                |
+|------------|-------------|---------------------|-------------------|
+| WeBASE     | 3.0.2       | 3.0.2               |                   |
+| WeIdentity | v3.0.0-rc.1 | v3.0.0-rc.1         |                   |
+| Console    | 3.6.0       | 3.0.0               |                   |
+| Java SDK   | 3.6.0       | 3.0.0               |                   |
+| CPP SDK    | 3.6.0       | 3.0.0               |                   |
+| Solidity   | 0.8.11      | 最低 0.4.25，最高 0.8.11 | 需根据合约版本下载编译器（控制台） |
+| WBC-Liquid | 1.0.0-rc3   | 1.0.0-rc3           |                   |
+
+#### 升级方法
+
+该操作仅支持将3.x版本升级为本版本，不支持3.0-rc或2.x的升级。
+
+##### 查询数据兼容版本号（compatibility_version）
+
+用[控制台](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/operation_and_maintenance/console/console_commands.html#getsystemconfigbykey)
+进行查询，如当前返回的版本为3.0.0
+
+``` 
+[group0]: /apps>  getSystemConfigByKey compatibility_version
+3.0.0
+```
+
+##### 替换节点二进制
+
+需将**所有节点**
+的二进制逐步替换为当前版本。为了不影响业务，替换过程能够以灰度方式进行，逐个替换并重启节点。替换过程中，当前的链仍然会以旧的数据兼容版本号的逻辑继续执行。当所有节点二进制替换完成并重启后，需用控制台修改数据兼容版本号为当前版本。
+
+##### 设置数据兼容版本号（compatibility_version）
+
+用[控制台](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/operation_and_maintenance/console/console_commands.html#setsystemconfigbykey)
+设置数据兼容版本号，如当前版本为3.6.0。
+
+```
+[group0]: /apps>  setSystemConfigByKey compatibility_version 3.6.0
+{
+    "code":0,
+    "msg":"success"
+}
+
+注：若开启权限治理功能，需要使用 setSysConfigProposal 命令
+```
+
+设置成功，再次查询，得到当前版本已升级为3.6.0
+
+``` 
+[group0]: /apps>  getSystemConfigByKey compatibility_version
+3.6.0
+```
+
+当前链已经完成升级，至此，**链开始以新的逻辑继续运行**，并支持了新的特性。
diff --git a/3.x/zh_CN/docs/introduction/change_log/index.rst b/3.x/zh_CN/docs/introduction/change_log/index.rst
@@ -26,7 +26,7 @@ v3.6.x
 .. admonition:: FISCO BCOS 3.x Releases
 
      - `FISCO BCOS v3.6.0 <./3_6_0.html>`_ [`release <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.6.0>`_]
-
+     - `FISCO BCOS v3.6.1 <./3_6_1.html>`_ [`release <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.6.1>`_]
 
 .. admonition:: 查看节点和数据版本
 
@@ -41,6 +41,7 @@ v3.6.x
    :maxdepth: 0
 
    3_6_0.md
+   3.6.1.md
 
 v3.5.x
 ------------------

diff --git a/3.x/zh_CN/docs/operation_and_maintenance/console/console_config.md b/3.x/zh_CN/docs/operation_and_maintenance/console/console_config.md
@@ -29,7 +29,7 @@ wbc-liquid编译环境搭建请参考：[wbc-liquid的环境配置](https://liqu
 ```shell
 cd ~ && mkdir -p fisco && cd fisco
 # 获取控制台下载脚本
-curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.5.0/download_console.sh 
+curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.6.0/download_console.sh 
 # 执行下载脚本
 bash download_console.sh
 ```

diff --git a/3.x/zh_CN/docs/quick_start/air_installation.md b/3.x/zh_CN/docs/quick_start/air_installation.md
@@ -49,18 +49,18 @@ sudo yum install -y curl openssl openssl-devel wget
 
 ```eval_rst
 .. note::
-   如果因为网络问题导致长时间无法下载build_chain.sh脚本，请尝试 curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.5.0/build_chain.sh && chmod u+x build_chain.sh
+   如果因为网络问题导致长时间无法下载build_chain.sh脚本，请尝试 curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.6.0/build_chain.sh && chmod u+x build_chain.sh
 ```
 
 ```shell
 # 创建操作目录
 cd ~ && mkdir -p fisco && cd fisco
 
 # 下载建链脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.5.0/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/build_chain.sh && chmod u+x build_chain.sh
 
 # Note: 若访问git网速太慢，可尝试如下命令下载建链脚本:
-curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.5.0/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.6.0/build_chain.sh && chmod u+x build_chain.sh
 ```
 
 ### 第三步. 搭建4节点非国密联盟链
@@ -192,7 +192,7 @@ sudo yum install -y java java-devel
 ### 第二步. 下载控制台
 
 ```shell
-cd ~/fisco && curl -LO https://github.com/FISCO-BCOS/console/releases/download/v3.5.0/download_console.sh && bash download_console.sh
+cd ~/fisco && curl -LO https://github.com/FISCO-BCOS/console/releases/download/v3.6.0/download_console.sh && bash download_console.sh
 ```
 
 ```eval_rst

diff --git a/3.x/zh_CN/docs/quick_start/solidity_application.md b/3.x/zh_CN/docs/quick_start/solidity_application.md
@@ -65,7 +65,7 @@ function transfer(string memory from_account, string memory to_account, uint256
 mkdir -p ~/fisco
 
 # 下载控制台
-cd ~/fisco && curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.5.0/download_console.sh && bash download_console.sh
+cd ~/fisco && curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.6.0/download_console.sh && bash download_console.sh
 
 # 切换到fisco/console/目录
 cd ~/fisco/console/

diff --git a/3.x/zh_CN/docs/quick_start/wbc_liquid_application.md b/3.x/zh_CN/docs/quick_start/wbc_liquid_application.md
@@ -86,7 +86,7 @@ pub fn transfer(&mut self, from: String, to: String, value: u128) -> i16
 mkdir -p ~/fisco
 
 # 下载控制台
-cd ~/fisco && curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.5.0/download_console.sh && bash download_console.sh
+cd ~/fisco && curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.6.0/download_console.sh && bash download_console.sh
 
 # 切换到fisco/console/目录
 cd ~/fisco/console/

diff --git a/3.x/zh_CN/docs/tutorial/air/build_chain.md b/3.x/zh_CN/docs/tutorial/air/build_chain.md
@@ -27,18 +27,18 @@ FISCO BCOS提供了`build_chain.sh`脚本帮助用户快速搭建FISCO BCOS联
 
 ```shell
 # 下载建链脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.5.0/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/build_chain.sh && chmod u+x build_chain.sh
 
 # Note: 若访问git网速太慢，可尝试如下命令下载建链脚本:
-curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.5.0/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.6.0/build_chain.sh && chmod u+x build_chain.sh
 
 # 键入bash build_chain.sh -h展示脚本用法及参数
 $ bash build_chain.sh
 Usage:
     -C <Command>                        [Optional] the command, support 'deploy' and 'expand' now, default is deploy
     -g <group id>                       [Optional] set the group id, default: group0
     -I <chain id>                       [Optional] set the chain id, default: chain0
-    -v <FISCO-BCOS binary version>      [Optional] Default is the latest v3.5.0
+    -v <FISCO-BCOS binary version>      [Optional] Default is the latest v3.6.0
     -l <IP list>                        [Required] "ip1:nodeNum1,ip2:nodeNum2" e.g:"192.168.0.1:2,192.168.0.2:3"
     -L <fisco bcos lightnode exec>      [Optional] fisco bcos lightnode executable, input "download_binary" to download lightnode binary or assign correct lightnode binary path
     -e <fisco-bcos exec>                [Optional] fisco-bcos binary exec
@@ -175,7 +175,7 @@ $ bash build_chain.sh -l 127.0.0.1:4 -s -o gm_nodes
 该模式下 start.sh 脚本启动节点的命令如下
 
 ```shell
-docker run -d --rm --name ${nodePath} -v ${nodePath}:/data --network=host -w=/data fiscoorg/fiscobcos:v3.5.0 -c config.ini -g config.genesis
+docker run -d --rm --name ${nodePath} -v ${nodePath}:/data --network=host -w=/data fiscoorg/fiscobcos:v3.6.0 -c config.ini -g config.genesis
 ```
 
 ### **`a`权限控制选项[**Optional**]**

diff --git a/3.x/zh_CN/docs/tutorial/air/multihost.md b/3.x/zh_CN/docs/tutorial/air/multihost.md
@@ -31,7 +31,7 @@ mkdir -p ~/fisco && cd ~/fisco
 ./download_bin.sh -v 3.4.0
 
 # 下载开发部署工具build_chain
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.5.0/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/build_chain.sh && chmod u+x build_chain.sh
 ```
 
 **生成多机节点配置**
@@ -214,7 +214,7 @@ sudo yum install -y java java-devel
 # 创建操作目录
 mkdir -p ~/fisco && cd ~/fisco
 
-curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.5.0/download_console.sh && bash download_console.sh
+curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.6.0/download_console.sh && bash download_console.sh
 
 # 若因为网络问题导致长时间无法下载，请尝试以下命令：
 curl -#LO  https://gitee.com/FISCO-BCOS/console/raw/master/tools/download_console.sh && bash download_console.sh

diff --git a/3.x/zh_CN/docs/tutorial/air/storage_security.md b/3.x/zh_CN/docs/tutorial/air/storage_security.md
@@ -25,12 +25,12 @@
 
 下载`build_chain.sh`脚本
 ``` shell
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.5.0/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/build_chain.sh && chmod u+x build_chain.sh
 ```
 
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载build_chain.sh脚本，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.5.0/build_chain.sh && chmod u+x build_chain.sh`
+    - 如果因为网络问题导致长时间无法下载build_chain.sh脚本，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.6.0/build_chain.sh && chmod u+x build_chain.sh`
 ```
 
 部署四个节点：

diff --git a/3.x/zh_CN/docs/tutorial/air/use_hsm.md b/3.x/zh_CN/docs/tutorial/air/use_hsm.md
@@ -45,7 +45,7 @@ cmake .. || cat *.log
 ```bash
 cd ~/fisco
 
-curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.5.0/build_chain.sh && chmod u+x build_chain.sh
+curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/build_chain.sh && chmod u+x build_chain.sh
 ```
 在build_chain同级目录下，创建文件夹（例如nodeKeyDir），用于存放密码机密钥的node.pem文件(证书数目和搭建节点数一致)。
 ```bash

diff --git a/3.x/zh_CN/docs/tutorial/docker.md b/3.x/zh_CN/docs/tutorial/docker.md
@@ -32,12 +32,12 @@ sudo yum install -y curl openssl openssl-devel
 cd ~ && mkdir -p fisco && cd fisco
 
 ## 下载脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.5.0/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/build_chain.sh && chmod u+x build_chain.sh
 ```
 
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载build_chain.sh脚本，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.5.0/build_chain.sh && chmod u+x build_chain.sh`
+    - 如果因为网络问题导致长时间无法下载build_chain.sh脚本，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.6.0/build_chain.sh && chmod u+x build_chain.sh`
 ```
 
 ## 3. 搭建单群组4节点区块链
@@ -79,7 +79,7 @@ writing RSA key
 [INFO] GroupID              : group0
 [INFO] ChainID              : chain0
 [INFO] docker mode      : true
-[INFO] docker tag       : v3.5.0
+[INFO] docker tag       : v3.6.0
 [INFO] Auth mode            : false
 [INFO] Start port           : 30300 20200
 [INFO] Server IP            : 127.0.0.1:4
@@ -101,14 +101,14 @@ try to start node0
 try to start node1
 try to start node2
 try to start node3
-Unable to find image 'fiscoorg/fiscobcos:v3.5.0' locally
-Unable to find image 'fiscoorg/fiscobcos:v3.5.0' locally
-Unable to find image 'fiscoorg/fiscobcos:v3.5.0' locally
-Unable to find image 'fiscoorg/fiscobcos:v3.5.0' locally
-v3.5.0: Pulling from fiscoorg/fiscobcos
-v3.5.0: Pulling from fiscoorg/fiscobcos
-v3.5.0: Pulling from fiscoorg/fiscobcos
-v3.5.0: Pulling from fiscoorg/fiscobcos
+Unable to find image 'fiscoorg/fiscobcos:v3.6.0' locally
+Unable to find image 'fiscoorg/fiscobcos:v3.6.0' locally
+Unable to find image 'fiscoorg/fiscobcos:v3.6.0' locally
+Unable to find image 'fiscoorg/fiscobcos:v3.6.0' locally
+v3.6.0: Pulling from fiscoorg/fiscobcos
+v3.6.0: Pulling from fiscoorg/fiscobcos
+v3.6.0: Pulling from fiscoorg/fiscobcos
+v3.6.0: Pulling from fiscoorg/fiscobcos
 Already exists a1778b69356: Already exists 
 
 dd98998da8ef: Pulling fs layer 
@@ -125,10 +125,10 @@ Digest: sha256:ddd677f51458a0ae07458f02bcb4c8cdd876b9323d889dad0c92a5f44244f2f7
 Digest: sha256:ddd677f51458a0ae07458f02bcb4c8cdd876b9323d889dad0c92a5f44244f2f7
 Digest: sha256:ddd677f51458a0ae07458f02bcb4c8cdd876b9323d889dad0c92a5f44244f2f7
 Digest: sha256:ddd677f51458a0ae07458f02bcb4c8cdd876b9323d889dad0c92a5f44244f2f7
-Status: Image is up to date for fiscoorg/fiscobcos:v3.5.0
-Status: Downloaded newer image for fiscoorg/fiscobcos:v3.5.0
-Status: Image is up to date for fiscoorg/fiscobcos:v3.5.0
-Status: Downloaded newer image for fiscoorg/fiscobcos:v3.5.0
+Status: Image is up to date for fiscoorg/fiscobcos:v3.6.0
+Status: Downloaded newer image for fiscoorg/fiscobcos:v3.6.0
+Status: Image is up to date for fiscoorg/fiscobcos:v3.6.0
+Status: Downloaded newer image for fiscoorg/fiscobcos:v3.6.0
 74342b325faed4cb5913cc80f18dee210ce7757f5a696e26c0a04d665f87b9ce
 a846dc34e23b32a5e5d7ee8f465f01e8d231734cf80bd6fd1ca92b2e8d3b9e9c
 efae6adb1ebe71b2b81237d51d61d9142736927a28fe91411ecc793a382e6998
@@ -146,10 +146,10 @@ de8b704d51a23888d3a129c081bd1e32d61da4af4029415bf7379feef75c0dee
 ```shell
 $ docker ps -a | egrep fiscobcos
 
-74342b325fae   fiscoorg/fiscobcos:v3.5.0    "/usr/local/bin/fisc…"   47 seconds ago   Up 45 seconds                        roottestnodes127.0.0.1node0
-efae6adb1ebe   fiscoorg/fiscobcos:v3.5.0    "/usr/local/bin/fisc…"   47 seconds ago   Up 45 seconds                        roottestnodes127.0.0.1node2
-a846dc34e23b   fiscoorg/fiscobcos:v3.5.0    "/usr/local/bin/fisc…"   47 seconds ago   Up 45 seconds                        roottestnodes127.0.0.1node1
-de8b704d51a2   fiscoorg/fiscobcos:v3.5.0    "/usr/local/bin/fisc…"   47 seconds ago   Up 45 seconds                        roottestnodes127.0.0.1node3
+74342b325fae   fiscoorg/fiscobcos:v3.6.0    "/usr/local/bin/fisc…"   47 seconds ago   Up 45 seconds                        roottestnodes127.0.0.1node0
+efae6adb1ebe   fiscoorg/fiscobcos:v3.6.0    "/usr/local/bin/fisc…"   47 seconds ago   Up 45 seconds                        roottestnodes127.0.0.1node2
+a846dc34e23b   fiscoorg/fiscobcos:v3.6.0    "/usr/local/bin/fisc…"   47 seconds ago   Up 45 seconds                        roottestnodes127.0.0.1node1
+de8b704d51a2   fiscoorg/fiscobcos:v3.6.0    "/usr/local/bin/fisc…"   47 seconds ago   Up 45 seconds                        roottestnodes127.0.0.1node3
 ```
 容器状态为`UP`时，说明节点正常启动。
 

diff --git a/3.x/zh_CN/docs/tutorial/lightnode.md b/3.x/zh_CN/docs/tutorial/lightnode.md
@@ -35,7 +35,7 @@ Usage:
     -C <Command>                        [Optional] the command, support 'deploy' and 'expand' now, default is deploy
     -g <group id>                       [Optional] set the group id, default: group0
     -I <chain id>                       [Optional] set the chain id, default: chain0
-    -v <FISCO-BCOS binary version>      [Optional] Default is the latest v3.5.0
+    -v <FISCO-BCOS binary version>      [Optional] Default is the latest v3.6.0
     -l <IP list>                        [Required] "ip1:nodeNum1,ip2:nodeNum2" e.g:"192.168.0.1:2,192.168.0.2:3"
     -L <fisco bcos lightnode exec>      [Optional] fisco bcos lightnode executable,input "download_binary" to download lightnode binary or assign correct lightnode binary path
     -e <fisco-bcos exec>                [Optional] fisco-bcos binary exec