diff --git a/2.x/docs/compatibility.md b/2.x/docs/compatibility.md index 698b4abbc..73d079ea6 100644 --- a/2.x/docs/compatibility.md +++ b/2.x/docs/compatibility.md @@ -477,3 +477,59 @@ FISCO-BCOS 3.0.0 及之后的版本之间相互兼容。FISCO-BCOS 3.0.0-rc的 | WeBankBlockchain-Governance-Key | 私钥管理组件 | v1.0.2 | [文档](https://governance-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-Governance-Key/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Key) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Key) | | | WeBankBlockchain-Governance-Authority | 权限治理组件 | V3 | [文档](https://governance-doc.readthedocs.io/zh_CN/v3.0.0/docs/WeBankBlockchain-Governance-Acct/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Account/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Account/tree/V3/) | | | WeBankBlockchain-Governance-Account | 账户治理组件 | V3 | [文档](https://governance-doc.readthedocs.io/zh_CN/v3.0.0/docs/WeBankBlockchain-Governance-Auth/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Authority/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Authority/tree/V3/) | | + +#### 3.2.13. FISCO-BCOS v3.9.x + +| 项目 | 功能简介 | 版本 | 文档 | github | gitee | 备注 | +|---------------------------------------|------------------------|-------------|-----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------|---------------------------------------------------------------------------|--------------------------| +| FISCO-BCOS | 区块链底层平台 | v3.9.x | [文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/) | [github](https://github.com/FISCO-BCOS/FISCO-BCOS/tree/v3.8.0) | [gitee](https://gitee.com/FISCO-BCOS/FISCO-BCOS/tree/v3.8.0) | | +| Solidity | solidity智能合约 | v0.8.11 | [文档](https://docs.soliditylang.org/en/v0.8.11) | | | **最高支持solidity v0.8.11** | +| JavaSDK | Java语言SDK | v3.7.x | [文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/sdk/java_sdk/index.html) | [github](https://github.com/FISCO-BCOS/java-sdk/tree/v3.7.0) | [gitee](https://gitee.com/FISCO-BCOS/java-sdk/tree/v3.7.0) | | +| GoSDK | Go语言SDK | 开发中 | | [github](https://github.com/FISCO-BCOS/go-sdk) | | | +| PythonSDK | Python语言SDK | 暂不支持 | | | | | +| 控制台(console) | 交互式命令行工具 | v3.7.x | [文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/console/index.html) | [github](https://github.com/FISCO-BCOS/console/tree/v3.7.0) | [gitee](https://gitee.com/FISCO-BCOS/console/tree/v3.7.0) | | +| java-sdk-demo | Java压测工具 | v3.10.x | [文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/stress_testing.html) | [github](https://github.com/FISCO-BCOS/java-sdk-demo/tree/3.7.0) | [gitee](https://gitee.com/FISCO-BCOS/java-sdk-demo/tree/3.7.0) | | +| spring-boot-starter | Gradle SpringBoot 应用示例 | v3.0.0 | [文档](https://github.com/FISCO-BCOS/spring-boot-starter/tree/v3.0.0-rc4#spring-boot-starter) | [github](https://github.com/FISCO-BCOS/spring-boot-starter/tree/v3.0.0) | [gitee](https://gitee.com/FISCO-BCOS/spring-boot-starter/tree/v3.0.0) | | +| spring-boot-crud | Maven SpringBoot 应用示例 | v3.0.0 | [文档](https://github.com/FISCO-BCOS/spring-boot-crud/tree/v3.0.0-rc4#spring-boot-crud) | [github](https://github.com/FISCO-BCOS/spring-boot-crud/tree/v3.0.0) | [gitee](https://gitee.com/FISCO-BCOS/spring-boot-crud/tree/v3.0.0) | | +| generator | 企业区块链部署工具 | 不支持 | | | | | +| WeBASE | 区块链中间件平台 | v3.0.2 | [文档](https://webasedoc.readthedocs.io/zh_CN/lab/) | [github](https://github.com/WeBankBlockchain/WeBASE/tree/master-3.0) | [gitee](https://gitee.com/WeBank/WeBASE/tree/master-3.0) | | +| WeCross | 跨链协作平台 | v1.3.0 | | | | | +| WeIdentity | 分布式身份解决方案 | v3.0.0-rc.1 | [文档](https://weidentity.readthedocs.io/zh_CN/latest/) | [github](https://github.com/WeBankBlockchain/WeIdentity) | [gitee](https://gitee.com/WeBank/WeIdentity) | | +| WeBankBlockchain-Data-Export | 数据导出组件 | V3 | [文档](https://data-doc.readthedocs.io/zh_CN/data_export_3.0/docs/WeBankBlockchain-Data-Export/index.html) | [github](https://github.com/WeBankBlockchain/Data-Export/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/Data-Export/tree/V3/) | | +| WeBankBlockchain-Data-Stash | 数据仓库组件 | 不支持 | | | | | +| WeBankBlockchain-Data-Reconcile | 数据对账组件 | v1.0.0 | [文档](https://data-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-Data-Reconcile/index.html) | [github](https://github.com/WeBankBlockchain/Data-Reconcile) | [gitee](https://gitee.com/WeBankBlockchain/Data-Reconcile) | | +| WeBankBlockchain-SmartDev-Scaffold | 应用开发脚手架 | V3 | [文档](https://toolkit-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-SmartDev-Scaffold/index.html) | [github](https://github.com/WeBankBlockchain/SmartDev-Scaffold/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/SmartDev-Scaffold/tree/V3/) | | +| WeBankBlockchain-SmartDev-SCGP | 智能合约编译插件 | v1.0.1 | [文档](https://toolkit-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-SmartDev-SCGP/index.html) | [github](https://github.com/WeBankBlockchain/SmartDev-SCGP) | [gitee](https://gitee.com/WeBankBlockchain/SmartDev-SCGP) | | +| WeBankBlockchain-SmartDev-Contract | 智能合约库 | v1.0.0 | [文档](https://toolkit-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-SmartDev-Contract/index.html) | [github](https://github.com/WeBankBlockchain/SmartDev-Contract) | [gitee](https://gitee.com/WeBankBlockchain/SmartDev-Contract) | | +| WeBankBlockchain-Governance-Cert | 证书管理组件 | v1.0.1 | [文档](https://governance-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-Governance-Cert/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Cert) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Cert) | | +| WeBankBlockchain-Governance-Key | 私钥管理组件 | v1.0.2 | [文档](https://governance-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-Governance-Key/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Key) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Key) | | +| WeBankBlockchain-Governance-Authority | 权限治理组件 | V3 | [文档](https://governance-doc.readthedocs.io/zh_CN/v3.0.0/docs/WeBankBlockchain-Governance-Acct/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Account/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Account/tree/V3/) | | +| WeBankBlockchain-Governance-Account | 账户治理组件 | V3 | [文档](https://governance-doc.readthedocs.io/zh_CN/v3.0.0/docs/WeBankBlockchain-Governance-Auth/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Authority/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Authority/tree/V3/) | | + +#### 3.2.14. FISCO-BCOS v3.10.x + +| 项目 | 功能简介 | 版本 | 文档 | github | gitee | 备注 | +|---------------------------------------|------------------------|-------------|-----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------|---------------------------------------------------------------------------|--------------------------| +| FISCO-BCOS | 区块链底层平台 | v3.10.x | [文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/) | [github](https://github.com/FISCO-BCOS/FISCO-BCOS/tree/v3.8.0) | [gitee](https://gitee.com/FISCO-BCOS/FISCO-BCOS/tree/v3.8.0) | | +| Solidity | solidity智能合约 | v0.8.26 | [文档](https://docs.soliditylang.org/en/v0.8.11) | | | **最高支持solidity v0.8.11** | +| JavaSDK | Java语言SDK | v3.8.x | [文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/sdk/java_sdk/index.html) | [github](https://github.com/FISCO-BCOS/java-sdk/tree/v3.7.0) | [gitee](https://gitee.com/FISCO-BCOS/java-sdk/tree/v3.7.0) | | +| GoSDK | Go语言SDK | 开发中 | | [github](https://github.com/FISCO-BCOS/go-sdk) | | | +| PythonSDK | Python语言SDK | 暂不支持 | | | | | +| 控制台(console) | 交互式命令行工具 | v3.8.x | [文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/console/index.html) | [github](https://github.com/FISCO-BCOS/console/tree/v3.7.0) | [gitee](https://gitee.com/FISCO-BCOS/console/tree/v3.7.0) | | +| java-sdk-demo | Java压测工具 | v3.10.x | [文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/stress_testing.html) | [github](https://github.com/FISCO-BCOS/java-sdk-demo/tree/3.7.0) | [gitee](https://gitee.com/FISCO-BCOS/java-sdk-demo/tree/3.7.0) | | +| spring-boot-starter | Gradle SpringBoot 应用示例 | v3.0.0 | [文档](https://github.com/FISCO-BCOS/spring-boot-starter/tree/v3.0.0-rc4#spring-boot-starter) | [github](https://github.com/FISCO-BCOS/spring-boot-starter/tree/v3.0.0) | [gitee](https://gitee.com/FISCO-BCOS/spring-boot-starter/tree/v3.0.0) | | +| spring-boot-crud | Maven SpringBoot 应用示例 | v3.0.0 | [文档](https://github.com/FISCO-BCOS/spring-boot-crud/tree/v3.0.0-rc4#spring-boot-crud) | [github](https://github.com/FISCO-BCOS/spring-boot-crud/tree/v3.0.0) | [gitee](https://gitee.com/FISCO-BCOS/spring-boot-crud/tree/v3.0.0) | | +| generator | 企业区块链部署工具 | 不支持 | | | | | +| WeBASE | 区块链中间件平台 | v3.0.2 | [文档](https://webasedoc.readthedocs.io/zh_CN/lab/) | [github](https://github.com/WeBankBlockchain/WeBASE/tree/master-3.0) | [gitee](https://gitee.com/WeBank/WeBASE/tree/master-3.0) | | +| WeCross | 跨链协作平台 | v1.3.0 | | | | | +| WeIdentity | 分布式身份解决方案 | v3.0.0-rc.1 | [文档](https://weidentity.readthedocs.io/zh_CN/latest/) | [github](https://github.com/WeBankBlockchain/WeIdentity) | [gitee](https://gitee.com/WeBank/WeIdentity) | | +| WeBankBlockchain-Data-Export | 数据导出组件 | V3 | [文档](https://data-doc.readthedocs.io/zh_CN/data_export_3.0/docs/WeBankBlockchain-Data-Export/index.html) | [github](https://github.com/WeBankBlockchain/Data-Export/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/Data-Export/tree/V3/) | | +| WeBankBlockchain-Data-Stash | 数据仓库组件 | 不支持 | | | | | +| WeBankBlockchain-Data-Reconcile | 数据对账组件 | v1.0.0 | [文档](https://data-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-Data-Reconcile/index.html) | [github](https://github.com/WeBankBlockchain/Data-Reconcile) | [gitee](https://gitee.com/WeBankBlockchain/Data-Reconcile) | | +| WeBankBlockchain-SmartDev-Scaffold | 应用开发脚手架 | V3 | [文档](https://toolkit-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-SmartDev-Scaffold/index.html) | [github](https://github.com/WeBankBlockchain/SmartDev-Scaffold/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/SmartDev-Scaffold/tree/V3/) | | +| WeBankBlockchain-SmartDev-SCGP | 智能合约编译插件 | v1.0.1 | [文档](https://toolkit-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-SmartDev-SCGP/index.html) | [github](https://github.com/WeBankBlockchain/SmartDev-SCGP) | [gitee](https://gitee.com/WeBankBlockchain/SmartDev-SCGP) | | +| WeBankBlockchain-SmartDev-Contract | 智能合约库 | v1.0.0 | [文档](https://toolkit-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-SmartDev-Contract/index.html) | [github](https://github.com/WeBankBlockchain/SmartDev-Contract) | [gitee](https://gitee.com/WeBankBlockchain/SmartDev-Contract) | | +| WeBankBlockchain-Governance-Cert | 证书管理组件 | v1.0.1 | [文档](https://governance-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-Governance-Cert/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Cert) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Cert) | | +| WeBankBlockchain-Governance-Key | 私钥管理组件 | v1.0.2 | [文档](https://governance-doc.readthedocs.io/zh_CN/latest/docs/WeBankBlockchain-Governance-Key/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Key) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Key) | | +| WeBankBlockchain-Governance-Authority | 权限治理组件 | V3 | [文档](https://governance-doc.readthedocs.io/zh_CN/v3.0.0/docs/WeBankBlockchain-Governance-Acct/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Account/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Account/tree/V3/) | | +| WeBankBlockchain-Governance-Account | 账户治理组件 | V3 | [文档](https://governance-doc.readthedocs.io/zh_CN/v3.0.0/docs/WeBankBlockchain-Governance-Auth/index.html) | [github](https://github.com/WeBankBlockchain/Governance-Authority/tree/V3) | [gitee](https://gitee.com/WeBankBlockchain/Governance-Authority/tree/V3/) | | diff --git a/3.x/zh_CN/docs/introduction/change_log/3_10_0.md b/3.x/zh_CN/docs/introduction/change_log/3_10_0.md new file mode 100644 index 000000000..66dfeef37 --- /dev/null +++ b/3.x/zh_CN/docs/introduction/change_log/3_10_0.md @@ -0,0 +1,136 @@ +# v3.10.0 + +## 新增 + +- +新增feature开关feature_evm_cancun，用于控制EVM升级至CANCUN版本。相关PR：[#4332](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4332) +- EVM支持至CANCUN版本，支持TLOAD, TSTORE, MCOPY, BLOBHASH and + BLOBBASEFEE等最新操作码，支持soldity为0.8.26版本合约部署。相关PR：[#4332](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4332) +- 一键搭链脚本增加开启日志级别为debug功能。相关PR：[#4411](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4511) + +## 修复 + +* +解决baseline模式下合约不存在时返回码与串行模式不同的问题。相关PR：[#4512](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4512) +* 解决baseline模式下合约revert时可能会内存泄露的问题。相关PR：[#4554](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4554) +* +限制baseline模式下缓存合约executive的数量，减少内存占用。相关PR：[#4559](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4559) +* 修复Web3 JSON RPC部分接口不填入Block + Tag导致节点退出的问题。PR：[#4547](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/4559) + +## 兼容性说明 + +### 兼容版本 + +需要升级的链的“数据兼容版本号（[compatibility_version](#id5)）”为如下版本时： + +* 3.4.x、3.5.x，3.6.x、3.7.x、3.8.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 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 | 默认关闭 | +| EVM升级至CANCUN | feature_evm_cancun | 关：0 | 默认关闭 | +| bug修复 | bugfix_\ | 开：1 | 从低版本升级默认关闭 | + +**组件兼容性** + +| | 推荐版本 | 最低版本 | 说明 | +|------------|-------------|---------------------|-------------------| +| WeBASE | 3.0.2 | 3.0.2 | | +| WeIdentity | v3.0.0-rc.1 | v3.0.0-rc.1 | | +| Console | 3.8.0 | 3.0.0 | | +| Java SDK | 3.8.0 | 3.0.0 | | +| CPP SDK | 3.8.0 | 3.0.0 | | +| Solidity | 0.8.26 | 最低 0.4.25，最高 0.8.26 | 需根据合约版本下载编译器（控制台） | +| 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.9.0 + +``` +[group0]: /apps> getSystemConfigByKey compatibility_version +3.9.0 +``` + +##### 替换节点二进制 + +需将**所有节点** +的二进制逐步替换为当前版本。为了不影响业务，替换过程能够以灰度方式进行，逐个替换并重启节点。替换过程中，当前的链仍然会以旧的数据兼容版本号的逻辑继续执行。当所有节点二进制替换完成并重启后，需用控制台修改数据兼容版本号为当前版本。 + +##### 设置数据兼容版本号（compatibility_version） + +用[控制台](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/operation_and_maintenance/console/console_commands.html#setsystemconfigbykey) +设置数据兼容版本号，如当前版本为3.9.0。 + +``` +[group0]: /apps> setSystemConfigByKey compatibility_version 3.9.0 +{ + "code":0, + "msg":"success" +} + +注：若开启权限治理功能，需要使用 setSysConfigProposal 命令 +``` + +设置成功，再次查询，得到当前版本已升级为3.10.0 + +``` +[group0]: /apps> getSystemConfigByKey compatibility_version +3.10.0 +``` + +当前链已经完成升级，至此，**链开始以新的逻辑继续运行**，并支持了新的特性。 + +#### EVM升级至CANCUN使用说明 + +首先通过控制台命令`setSystemConfigByKey feature_evm_cancun 1`开启EVM升级至CANCUN功能，然后部署0.8.26版本的合约。 + +注意：在部署0.8.26版本合约时，需要在depoly 后面指定sol-version 为0.8.26，如下所示： + +``` + +[group0]: /apps> deploy StorageSlot.sol --sol-version 0.8.26 +transaction hash: 0x8f3564047e3dd2913ed30f193e10c2b8af2b24896ce10b8add8eb47b888d7505 +contract address: 0x29f1926cab679bc8bdd0757fb92adf020c8bd398 +currentAccount: 0x0296737557c85bde21b4cf766c3f85e2e4c14d66 + +// 否则使用默认0.8.11版本编译则会报错 +[group0]: /apps> deploy StorageSlot.sol +Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: " to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information. +--> StorageSlot.sol + +Error: Function "tload" not found. + --> StorageSlot.sol:127:22: + | +127 | value := tload(slot) + | ^^^^^ + +Error: Variable count for assignment to "value" does not match number of values (1 vs. 0) + +``` \ No newline at end of file diff --git a/3.x/zh_CN/docs/introduction/change_log/3_9_0.md b/3.x/zh_CN/docs/introduction/change_log/3_9_0.md index d02d4467e..ef494a316 100644 --- a/3.x/zh_CN/docs/introduction/change_log/3_9_0.md +++ b/3.x/zh_CN/docs/introduction/change_log/3_9_0.md @@ -1,4 +1,4 @@ -# v3.8.0 +# v3.9.0 ## 新增 @@ -84,7 +84,7 @@ 设置数据兼容版本号，如当前版本为3.7.0。 ``` -[group0]: /apps> setSystemConfigByKey compatibility_version 3.8.0 +[group0]: /apps> setSystemConfigByKey compatibility_version 3.9.0 { "code":0, "msg":"success" @@ -93,11 +93,11 @@ 注：若开启权限治理功能，需要使用 setSysConfigProposal 命令 ``` -设置成功，再次查询，得到当前版本已升级为3.8.0 +设置成功，再次查询，得到当前版本已升级为3.9.0 ``` [group0]: /apps> getSystemConfigByKey compatibility_version -3.8.0 +3.9.0 ``` 当前链已经完成升级，至此，**链开始以新的逻辑继续运行**，并支持了新的特性。 diff --git a/3.x/zh_CN/docs/introduction/change_log/feature_bugfix_list.md b/3.x/zh_CN/docs/introduction/change_log/feature_bugfix_list.md index d1831850b..e70296635 100644 --- a/3.x/zh_CN/docs/introduction/change_log/feature_bugfix_list.md +++ b/3.x/zh_CN/docs/introduction/change_log/feature_bugfix_list.md @@ -4,15 +4,16 @@ ## 1. 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 | 默认关闭 | -| dmc切换至串行 | feature_dmc2serial | 关：0 | 默认关闭 | +| | 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 | 默认关闭 | +| dmc切换至串行 | feature_dmc2serial | 关：0 | 默认关闭 | +| EVM升级至CANCUN | feature_evm_cancun | 关：0 | 默认关闭 | ## 2. bugfix列表 diff --git a/3.x/zh_CN/docs/introduction/change_log/index.rst b/3.x/zh_CN/docs/introduction/change_log/index.rst index 565a87b8a..f6815ea88 100644 --- a/3.x/zh_CN/docs/introduction/change_log/index.rst +++ b/3.x/zh_CN/docs/introduction/change_log/index.rst @@ -21,6 +21,26 @@ FISCO BCOS 设计 Feature控制特性功能开启关闭，用户可以根据自 :maxdepth: 0 upgrade.md +v3.10.x +------------------ + +.. admonition:: FISCO BCOS 3.x Releases + + - `FISCO BCOS v3.10.0 <./3_10_0.html>`_ [`release `_] + +.. admonition:: 查看节点和数据版本 + + - 查看Air版本FISCO BCOS节点二进制版本：``./fisco-bcos --version`` + - 查看Pro版本FISCO BCOS节点二进制版本：``./BcosNodeService --version``, ``./BcosRpcService --version``, ``./BcosGatewayService --version`` + - 查看Max版本FISCO BCOS节点二进制版本：``./BcosMaxNodeService --version``, ``./BcosRpcService --version``, ``./BcosGatewayService --version``, ``./BcosExecutorService --version`` + - 查看轻节点二进制版本：``../fisco-bcos-lightnode --version`` + - 查看轻节点相关文档，请参考 [`轻节点搭建工具 `_] + +.. toctree:: + :hidden: + :maxdepth: 0 + + 3_10_0.md v3.9.x ------------------ diff --git a/3.x/zh_CN/docs/quick_start/air_installation.md b/3.x/zh_CN/docs/quick_start/air_installation.md index 4af6defb3..90ca2336c 100644 --- a/3.x/zh_CN/docs/quick_start/air_installation.md +++ b/3.x/zh_CN/docs/quick_start/air_installation.md @@ -49,7 +49,7 @@ 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.9.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.10.0/build_chain.sh && chmod u+x build_chain.sh ``` ```shell @@ -57,10 +57,10 @@ sudo yum install -y curl openssl openssl-devel wget cd ~ && mkdir -p fisco && cd fisco # 下载建链脚本 -curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.9.0/build_chain.sh && chmod u+x build_chain.sh +curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.10.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.9.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.10.0/build_chain.sh && chmod u+x build_chain.sh ``` ### 第三步. 搭建4节点非国密联盟链 diff --git a/3.x/zh_CN/docs/quick_start/solidity_application.md b/3.x/zh_CN/docs/quick_start/solidity_application.md index 00e74deab..e6f7faccc 100644 --- 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.6.0/download_console.sh && bash download_console.sh +cd ~/fisco && curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.10.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 index 2cf9b5c51..1eb84b35b 100644 --- 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.6.0/download_console.sh && bash download_console.sh +cd ~/fisco && curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.10.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 index 24e53333d..9fd559169 100644 --- a/3.x/zh_CN/docs/tutorial/air/build_chain.md +++ b/3.x/zh_CN/docs/tutorial/air/build_chain.md @@ -27,7 +27,7 @@ FISCO BCOS提供了`build_chain.sh`脚本帮助用户快速搭建FISCO BCOS联 ```shell # 下载建链脚本 -curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/build_chain.sh && chmod u+x build_chain.sh +curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.10.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.6.0/build_chain.sh && chmod u+x build_chain.sh @@ -35,10 +35,11 @@ curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO- # 键入bash build_chain.sh -h展示脚本用法及参数 $ bash build_chain.sh Usage: +air -C [Optional] the command, support 'deploy' and 'expand' now, default is deploy -g [Optional] set the group id, default: group0 -I [Optional] set the chain id, default: chain0 - -v [Optional] Default is the latest v3.6.0 + -v [Optional] Default is the latest v3.10.0 -l [Required] "ip1:nodeNum1,ip2:nodeNum2" e.g:"192.168.0.1:2,192.168.0.2:3" -L [Optional] fisco bcos lightnode executable, input "download_binary" to download lightnode binary or assign correct lightnode binary path -e [Optional] fisco-bcos binary exec @@ -49,28 +50,73 @@ Usage: -H [Optional] Whether to use HSM(Hardware secure module), default is false -c [Required when expand node] Specify the path of the expanded node config.ini, config.genesis and p2p connection file nodes.json -d [Required when expand node] When expanding the node, specify the path where the CA certificate and private key are located - -D Default off. If set -d, build with docker + -D Default off. If set -D, build with docker + -E Default off. If set -E, enable debug log -a [Optional] when Auth mode Specify the admin account address. -w [Optional] Whether to use the wasm virtual machine engine, default is false -R [Optional] Whether to use serial execute,default is true - -k [Optional] key page size, default size is 10240 + -k [Optional] key page size, default is 10240 -m [Optional] node monitor or not, default is false -i [Optional] When expanding the node, should specify ip and port -M [Optional] When expanding the node, specify the path where prometheus are located -z [Optional] Pack the data on the chain to generate tar packet -n [Optional] set the path of the node key file to load nodeid + -N [Optional] set the path of the node modified to multi ca mode + -u [Optional] set the path of another ca for multi ca mode + -6 [Optional] IPv6 mode use :: as default listen ip, default is false + -T [Optional] Default PBFT. Options can be pbft / rpbft, pbft is recommended + -h Help +pro or max + -C [Optional] the command, support 'deploy' now, default is deploy + -g [Optional] set the group id, default: group0 + -I [Optional] set the chain id, default: chain0 + -V [Optional] support 'air'、'pro'、'max', default is 'air' + -l [Required] "ip1:nodeNum1,ip2:nodeNum2" e.g:"192.168.0.1:2,192.168.0.2:3" + -p [Optional] Default 30300、20200、40400、2379 means p2p_port start from 30300, rpc_port from 20200, tars_port from 40400, tikv_port default 2379 + -e [Optional] rpc gateway node service binary path + -y [Optional] rpc gateway node service binary download type, default type is cdn + -v [Optional] Default is the latest v3.10.0 + -r [Optional] service binary download path, default is binary + -c [Optional] Specify the path of the deploy node config.toml + -t [Optional] support 'rpc'、'gateway'、'node'、'all', default is 'all' + -o [Optional] output directory, default genearted + -s [Optional] SM SSL connection or not, default is false -h Help deploy nodes e.g bash build_chain.sh -p 30300,20200 -l 127.0.0.1:4 -o nodes -e ./fisco-bcos - bash build_chain.sh -p 30300,20200 -l 127.0.0.1:4 -o nodes -e ./fisco-bcos -m (部署节点带监控功能) + bash build_chain.sh -p 30300,20200 -l 127.0.0.1:4 -o nodes -e ./fisco-bcos -m bash build_chain.sh -p 30300,20200 -l 127.0.0.1:4 -o nodes -e ./fisco-bcos -s expand node e.g bash build_chain.sh -C expand -c config -d config/ca -o nodes/127.0.0.1/node5 -e ./fisco-bcos - bash build_chain.sh -C expand -c config -d config/ca -o nodes/127.0.0.1/node5 -e ./fisco-bcos -m -i 127.0.0.1:5 -M monitor/prometheus/prometheus.yml (部署节点带监控功能) + bash build_chain.sh -C expand -c config -d config/ca -o nodes/127.0.0.1/node5 -e ./fisco-bcos -m -i 127.0.0.1:5 -M monitor/prometheus/prometheus.yml bash build_chain.sh -C expand -c config -d config/ca -o nodes/127.0.0.1/node5 -e ./fisco-bcos -s bash build_chain.sh -C expand_lightnode -c config -d config/ca -o nodes/lightnode1 bash build_chain.sh -C expand_lightnode -c config -d config/ca -o nodes/lightnode1 -L ./fisco-bcos-lightnode +modify node e.g + bash build_chain.sh -C modify -N ./node0 -u ./ca/ca.crt + bash build_chain.sh -C modify -N ./node0 -u ./ca/ca.crt -s +deploy pro service e.g + bash build_chain.sh -p 30300,20200 -l 172.31.184.227:2,172.30.93.111:2 -C deploy -V pro -o generate -t all + bash build_chain.sh -p 30300,20200 -l 172.31.184.227:2,172.30.93.111:2 -C deploy -V pro -o generate -t all -s + bash build_chain.sh -p 30300,20200 -l 172.31.184.227:2,172.30.93.111:2 -C deploy -V pro -o generate -e ./binary + bash build_chain.sh -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.10.0 -r ./binaryPath +deploy max service e.g + bash build_chain.sh -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 build_chain.sh -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 build_chain.sh -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.10.0 -r ./binaryPath + bash build_chain.sh -c config.toml -C deploy -V max -o generate -t all +expand pro node e.g + bash build_chain.sh -C expand_node -V pro -o expand_node -c ./config.toml +expand pro rpc/gateway e.g + bash build_chain.sh -C expand_service -V pro -o expand_service -c ./config.toml +expand pro group e.g + bash build_chain.sh -C expand_group -V pro -o expand_group -c ./config.toml +expand max node e.g + bash build_chain.sh -C expand_node -V max -o expand_node -c ./config.toml +expand max rpc/gateway e.g + bash build_chain.sh -C expand_service -V max -o expand_service -c ./config.toml + ``` @@ -247,15 +293,21 @@ Processing IP:127.0.0.1 Total:4 查看脚本使用用法。 +### **`E`选项[**Optional**]** + +可选参数，当需要开启debug日志时，可通过`-E`选项设置开启debug日志。 + ## 2. 节点配置文件组织结构 `build_chain`生成的节点配置主要如下： - **根证书和根证书私钥**: 位于指定的配置生成目录的`ca`文件夹。 -- **节点连接证书**: 每个节点`conf`目录下均存放节点的网络连接证书，非国密节点证书和私钥主要包括`ca.crt, ssl.crt, sslkey`，国密节点证书和私钥主要包括`sm_ca.crt, sm_ssl.crt, sm_enssl.crt, sm_enssl.key, sm_ssl.key`。 +- **节点连接证书**: 每个节点`conf`目录下均存放节点的网络连接证书，非国密节点证书和私钥主要包括`ca.crt, ssl.crt, sslkey` + ，国密节点证书和私钥主要包括`sm_ca.crt, sm_ssl.crt, sm_enssl.crt, sm_enssl.key, sm_ssl.key`。 - **节点签名私钥**: 节点`conf`目录下的`node.pem`，主要位于共识模块的签名。 - **SDK连接证书**: 由`build_chain.sh`生成，客户端可拷贝该证书与节点建立SSL连接。 -- **节点配置文件**: 节点目录下的`config.ini`和`config.genesis`配置，前者主要配置链信息，后者主要配置创世块信息，具体可参考[Air版本区块链节点配置介绍](./config.md)。 +- **节点配置文件**: 节点目录下的`config.ini`和`config.genesis` + 配置，前者主要配置链信息，后者主要配置创世块信息，具体可参考[Air版本区块链节点配置介绍](./config.md)。 - **启停脚本**: `start.sh`和`stop.sh`，用于启动和停止节点。 - **启停监控脚本**: `monitor/start_monitor.sh`和`monitor/stop_monitor.sh`，用于启动和停止节点监控。 diff --git a/3.x/zh_CN/docs/tutorial/air/multihost.md b/3.x/zh_CN/docs/tutorial/air/multihost.md index b5193d539..80e020c48 100644 --- 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.6.0/build_chain.sh && chmod u+x build_chain.sh +curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.10.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.6.0/download_console.sh && bash download_console.sh +curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v3.10.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 index 24c3bc752..43cf7089f 100644 --- a/3.x/zh_CN/docs/tutorial/air/storage_security.md +++ b/3.x/zh_CN/docs/tutorial/air/storage_security.md @@ -25,7 +25,7 @@ 下载`build_chain.sh`脚本 ``` shell -curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/build_chain.sh && chmod u+x build_chain.sh +curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.10.0/build_chain.sh && chmod u+x build_chain.sh ``` ```eval_rst diff --git a/3.x/zh_CN/docs/tutorial/air/use_hsm.md b/3.x/zh_CN/docs/tutorial/air/use_hsm.md index f74ccfd2a..edea2ac68 100644 --- 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.6.0/build_chain.sh && chmod u+x build_chain.sh +curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.10.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/max/installation.md b/3.x/zh_CN/docs/tutorial/max/installation.md index 9d345a986..913598eac 100644 --- a/3.x/zh_CN/docs/tutorial/max/installation.md +++ b/3.x/zh_CN/docs/tutorial/max/installation.md @@ -53,7 +53,7 @@ brew install curl docker docker-compose python3 wget mkdir -p ~/fisco && cd ~/fisco # 下载区块链构建工具BcosBuilder -curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/BcosBuilder.tgz && tar -xvf BcosBuilder.tgz +curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.10.0/BcosBuilder.tgz && tar -xvf BcosBuilder.tgz # Note: 若网速太慢，可尝试如下命令下载部署脚本: curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.6.0/BcosBuilder.tgz && tar -xvf BcosBuilder.tgz @@ -435,7 +435,7 @@ sudo yum install -y java java-devel **步骤1：下载控制台** ```shell -cd ~/fisco && curl -LO https://github.com/FISCO-BCOS/console/releases/download/v3.6.0/download_console.sh && bash download_console.sh +cd ~/fisco && curl -LO https://github.com/FISCO-BCOS/console/releases/download/v3.10.0/download_console.sh && bash download_console.sh ``` ```eval_rst .. note:: diff --git a/3.x/zh_CN/docs/tutorial/pro/installation.md b/3.x/zh_CN/docs/tutorial/pro/installation.md index c916747ff..83879ab7b 100644 --- a/3.x/zh_CN/docs/tutorial/pro/installation.md +++ b/3.x/zh_CN/docs/tutorial/pro/installation.md @@ -49,7 +49,7 @@ brew install curl docker docker-compose python3 wget mkdir -p ~/fisco && cd ~/fisco # 下载Pro版区块链构建工具BcosBuilder -curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.6.0/BcosBuilder.tgz && tar -xvf BcosBuilder.tgz +curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v3.10.0/BcosBuilder.tgz && tar -xvf BcosBuilder.tgz # Note: 若网速太慢，可尝试如下命令下载部署脚本: curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.6.0/BcosBuilder.tgz && tar -xvf BcosBuilder.tgz @@ -610,7 +610,7 @@ sudo yum install -y java java-devel **步骤1：下载控制台** ```shell -cd ~/fisco && curl -LO https://github.com/FISCO-BCOS/console/releases/download/v3.6.0/download_console.sh && bash download_console.sh +cd ~/fisco && curl -LO https://github.com/FISCO-BCOS/console/releases/download/v3.10.0/download_console.sh && bash download_console.sh ``` ```eval_rst .. note::