update version to 3.6.0

bcos-sdk/SWIG/build.gradle

@@ -8,7 +8,7 @@ println("Notice: current gradle version is " + gradle.gradleVersion)
 
 allprojects {
     group = 'org.fisco-bcos'
-    version = '3.5.0'
+    version = '3.6.0'
 
     apply plugin: 'maven-publish'
     apply plugin: 'java'

docs/README_EN.md

@@ -14,7 +14,7 @@ In a single-chain configuration, the performance TPS can reach 100k. It fully su
 
 - Stable Version (for production environment): v3.2.3, version details can be found in [FISCO-BCOS v3.2.3 Release Notes](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.2.3).
 
-- Latest Version (for experiencing new features): v3.5.0, version details can be found in [FISCO-BCOS v3.5.0 Release Notes](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.5.0).
+- Latest Version (for experiencing new features): v3.6.0, version details can be found in [FISCO-BCOS v3.6.0 Release Notes](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.6.0).
 
 ## System Overview
 The architecture of FISCO BCOS system consists of the basic layer, core layer, service layer, user layer, and access layer on the left-hand side, providing stable and secure blockchain underlying services. The middleware layer simplifies the process of managing the blockchain system through a visual interface. On the right-hand side, there are supporting components for development, operation, and security control, meeting the needs of different roles during the application implementation process. Meanwhile, privacy protection and cross-chain-related technology components are also provided to satisfy the application requirements in different scenarios.

tools/BcosAirBuilder/build_chain.sh

@@ -39,7 +39,7 @@ ca_dir=""
 prometheus_dir=""
 config_path=""
 docker_mode=
-default_version="v3.5.0"
+default_version="v3.6.0"
 compatibility_version=${default_version}
 default_mtail_version="3.0.0-rc49"
 compatibility_mtail_version=${default_mtail_version}
@@ -69,11 +69,11 @@ supported_consensus=(pbft rpbft)
 
 # for pro or max default setting
 bcos_builder_package=BcosBuilder.tgz
-bcos_builder_version=v3.5.0
+bcos_builder_version=v3.6.0
 use_exist_binary="false"
 download_specific_binary_flag="false"
 download_service_binary_type="cdn"
-service_binary_version="v3.5.0"
+service_binary_version="v3.6.0"
 download_service_binary_path="binary"
 download_service_binary_path_flag="false"
 service_type="all"
@@ -624,11 +624,11 @@ deploy pro service e.g
     bash $0 -p 30300,20200 -l 172.31.184.227:2,172.30.93.111:2 -C deploy -V pro -o generate -t all
     bash $0 -p 30300,20200 -l 172.31.184.227:2,172.30.93.111:2 -C deploy -V pro -o generate -t all -s
     bash $0 -p 30300,20200 -l 172.31.184.227:2,172.30.93.111:2 -C deploy -V pro -o generate -e ./binary
-    bash $0 -p 30300,20200,40400 -l 172.31.184.227:2,172.30.93.111:2 -C deploy -V pro -o generate -y cdn -v v3.5.0 -r ./binaryPath
+    bash $0 -p 30300,20200,40400 -l 172.31.184.227:2,172.30.93.111:2 -C deploy -V pro -o generate -y cdn -v ${service_binary_version} -r ./binaryPath
 deploy max service e.g
     bash $0 -p 30300,20200,40400,2379 -l 172.31.184.227:1,172.30.93.111:1,172.31.184.54:1,172.31.185.59:1 -C deploy -V max -o generate -t all
     bash $0 -p 30300,20200,40400,2379 -l 172.31.184.227:1,172.30.93.111:1,172.31.184.54:1,172.31.185.59:1 -C deploy -V max -o generate -t all -e ./binary -s
-    bash $0 -p 30300,20200,40400,2379 -l 172.31.184.227:1,172.30.93.111:1,172.31.184.54:1,172.31.185.59:1 -C deploy -V max -o generate -y cdn -v v3.5.0 -r ./binaryPath 
+    bash $0 -p 30300,20200,40400,2379 -l 172.31.184.227:1,172.30.93.111:1,172.31.184.54:1,172.31.185.59:1 -C deploy -V max -o generate -y cdn -v ${service_binary_version} -r ./binaryPath
     bash $0 -c config.toml -C deploy -V max -o generate -t all
 expand pro node e.g
     bash $0 -C expand_node -V pro -o expand_node -c ./config.toml
@@ -1727,7 +1727,7 @@ generate_genesis_config() {
 
 [version]
     ; compatible version, can be dynamically upgraded through setSystemConfig
-    ; the default is 3.5.0
+    ; the default is ${compatibility_version//[vV]/}
     compatibility_version=${compatibility_version//[vV]/}
 [tx]
     ; transaction gas limit

tools/BcosBuilder/max/conf/config-deploy-example.toml

@@ -36,7 +36,7 @@ consensus_type = "pbft"
 # transaction gas limit
 gas_limit = "3000000000"
 # compatible version, can be dynamically upgraded through setSystemConfig
-compatibility_version="3.5.0"
+compatibility_version="3.6.0"
 
 [[agency]]
 name = "agencyA"

tools/BcosBuilder/pro/conf/config-build-example.toml

@@ -34,7 +34,7 @@ consensus_type = "pbft"
 # transaction gas limit
 gas_limit = "3000000000"
 # compatible version, can be dynamically upgraded through setSystemConfig
-compatibility_version="3.5.0"
+compatibility_version="3.6.0"
 
 [[agency]]
 name = "agencyA"

tools/BcosBuilder/pro/conf/config-deploy-example.toml

@@ -36,7 +36,7 @@ consensus_type = "pbft"
 # transaction gas limit
 gas_limit = "3000000000"
 # compatible version, can be dynamically upgraded through setSystemConfig
-compatibility_version="3.5.0"
+compatibility_version="3.6.0"
 
 [[agency]]
 name = "agencyA"

tools/BcosBuilder/src/common/utilities.py

@@ -99,7 +99,7 @@ class CommandInfo:
     network_add_vxlan = "add-vxlan"
     download_binary = "download_binary"
     download_type = ["cdn", "git"]
-    default_binary_version = "v3.5.0"
+    default_binary_version = "v3.6.0"
     command_list = [gen_config, upload, deploy,
                     upgrade, undeploy, expand, start, stop]
     service_command_list_str = ', '.join(command_list)

tools/BcosBuilder/src/tpl/config.genesis

@@ -22,7 +22,7 @@
 
 [version]
     ; compatible version, can be dynamically upgraded through setSystemConfig
-    compatibility_version=3.5.0
+    compatibility_version=3.6.0
 
 [tx]
     ; transaction gas limit

vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "fiscobcos",
-  "version-string": "3.5.0",
+  "version-string": "3.6.0",
   "homepage": "https://github.com/FISCO-BCOS/FISCO-BCOS",
   "description": "FISCO BCOS",
   "dependencies": [