Skip to content

Commit

Permalink
Merge pull request #1732 from kyonRay/release-3.5.0
Browse files Browse the repository at this point in the history 
<doc>(sync): sync code from release-3
  • Loading branch information
@kyonRay
kyonRay authored Sep 6, 2023
2 parents f797822 + 63373a9 commit c77ebd5
Show file tree
Hide file tree
Showing 10 changed files with 141 additions and 98 deletions.
2 changes: 1 addition & 1 deletion 3.x/zh_CN/docs/develop/api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Java SDK为区块链应用开发者提供了Java API接口，按照功能，Java
**示例：**
```
// Request
curl -X POST --data '{"jsonrpc":"2.0","method":"sendTransaction","params":["group0","","0x1a1c2606636861696e30360667726f7570304101fb564d36323332373833373230383636323235323233313231343039373038383134363030353536383536313037383031313639373432363032343636323131353337373138313837323836303337397d0001046b608060405234801561001057600080fd5b5060408051808201909152600d8082526c48656c6c6f2c20576f726c642160981b60209092019182526100459160009161004b565b5061011f565b828054610057906100e4565b90600052602060002090601f01602090048101928261007957600085556100bf565b82601f1061009257805160ff19168380011785556100bf565b828001600101855582156100bf579182015b828111156100bf5782518255916020019190600101906100a4565b506100cb9291506100cf565b5090565b5b808211156100cb57600081556001016100d0565b600181811c908216806100f857607f821691505b602082108114156101195763b95aa35560e01b600052602260045260246000fd5b50919050565b61033d8061012e6000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063299f7f9d1461003b5780633590b49f14610059575b600080fd5b61004361006e565b60405161005091906101b0565b60405180910390f35b61006c61006736600461021b565b610100565b005b60606000805461007d906102cc565b80601f01602080910402602001604051908101604052809291908181526020018280546100a9906102cc565b80156100f65780601f106100cb576101008083540402835291602001916100f6565b820191906000526020600020905b8154815290600101906020018083116100d957829003601f168201915b5050505050905090565b8051610113906000906020840190610117565b5050565b828054610123906102cc565b90600052602060002090601f016020900481019282610145576000855561018b565b82601f1061015e57805160ff191683800117855561018b565b8280016001018555821561018b579182015b8281111561018b578251825591602001919060010190610170565b5061019792915061019b565b5090565b5b80821115610197576000815560010161019c565b600060208083528351808285015260005b818110156101dd578581018301518582016040015282016101c1565b818111156101ef576000604083870101525b50601f01601f1916929092016040019392505050565b63b95aa35560e01b600052604160045260246000fd5b60006020828403121561022d57600080fd5b813567ffffffffffffffff8082111561024557600080fd5b818401915084601f83011261025957600080fd5b81358181111561026b5761026b610205565b604051601f8201601f19908116603f0116810190838211818310171561029357610293610205565b816040528281528760208487010111156102ac57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600181811c908216806102e057607f821691505b602082108114156103015763b95aa35560e01b600052602260045260246000fd5b5091905056fea2646970667358221220ad3331f4f52a10ab9c50f2e63a46fd49fab3847ff4e17912290db8f009f89c9464736f6c634300080b003387000001565b7b22696e70757473223a5b5d2c2273746174654d75746162696c697479223a226e6f6e70617961626c65222c2274797065223a22636f6e7374727563746f72227d2c7b22696e70757473223a5b5d2c226e616d65223a22676574222c226f757470757473223a5b7b22696e7465726e616c54797065223a22737472696e67222c226e616d65223a22222c2274797065223a22737472696e67227d5d2c2273746174654d75746162696c697479223a2276696577222c2274797065223a2266756e6374696f6e227d2c7b22696e70757473223a5b7b22696e7465726e616c54797065223a22737472696e67222c226e616d65223a226e222c2274797065223a22737472696e67227d5d2c226e616d65223a22736574222c226f757470757473223a5b5d2c2273746174654d75746162696c697479223a226e6f6e70617961626c65222c2274797065223a2266756e6374696f6e227d5d0b2d000020867fc7059f04e9f172202b777673a8413c9e47990dcd09b11311a2f1f5b55a4f3d0001008015e0c4a3a51b5b5b157502aae04f3905bae8daf1389bddf12b0eb7069ead63b76d42383dcd38520df339d571d37ea85334dba126edcc323a98b91e51d32ec074b5f7430ea78c64ccc8d364bf4563dbffb33be503344b72f3384f987c38af98db3f0f00169f2a6545d0920a1a6cb7f338b8b717f03d05fded80ddbbb171a099c1"，true],"id":1}' http://127.0.0.1:20200
curl -X POST --data '{"jsonrpc":"2.0","method":"sendTransaction","params":["group0","","0x1a1c2606636861696e30360667726f7570304101fb564d36323332373833373230383636323235323233313231343039373038383134363030353536383536313037383031313639373432363032343636323131353337373138313837323836303337397d0001046b608060405234801561001057600080fd5b5060408051808201909152600d8082526c48656c6c6f2c20576f726c642160981b60209092019182526100459160009161004b565b5061011f565b828054610057906100e4565b90600052602060002090601f01602090048101928261007957600085556100bf565b82601f1061009257805160ff19168380011785556100bf565b828001600101855582156100bf579182015b828111156100bf5782518255916020019190600101906100a4565b506100cb9291506100cf565b5090565b5b808211156100cb57600081556001016100d0565b600181811c908216806100f857607f821691505b602082108114156101195763b95aa35560e01b600052602260045260246000fd5b50919050565b61033d8061012e6000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063299f7f9d1461003b5780633590b49f14610059575b600080fd5b61004361006e565b60405161005091906101b0565b60405180910390f35b61006c61006736600461021b565b610100565b005b60606000805461007d906102cc565b80601f01602080910402602001604051908101604052809291908181526020018280546100a9906102cc565b80156100f65780601f106100cb576101008083540402835291602001916100f6565b820191906000526020600020905b8154815290600101906020018083116100d957829003601f168201915b5050505050905090565b8051610113906000906020840190610117565b5050565b828054610123906102cc565b90600052602060002090601f016020900481019282610145576000855561018b565b82601f1061015e57805160ff191683800117855561018b565b8280016001018555821561018b579182015b8281111561018b578251825591602001919060010190610170565b5061019792915061019b565b5090565b5b80821115610197576000815560010161019c565b600060208083528351808285015260005b818110156101dd578581018301518582016040015282016101c1565b818111156101ef576000604083870101525b50601f01601f1916929092016040019392505050565b63b95aa35560e01b600052604160045260246000fd5b60006020828403121561022d57600080fd5b813567ffffffffffffffff8082111561024557600080fd5b818401915084601f83011261025957600080fd5b81358181111561026b5761026b610205565b604051601f8201601f19908116603f0116810190838211818310171561029357610293610205565b816040528281528760208487010111156102ac57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600181811c908216806102e057607f821691505b602082108114156103015763b95aa35560e01b600052602260045260246000fd5b5091905056fea2646970667358221220ad3331f4f52a10ab9c50f2e63a46fd49fab3847ff4e17912290db8f009f89c9464736f6c634300080b003387000001565b7b22696e70757473223a5b5d2c2273746174654d75746162696c697479223a226e6f6e70617961626c65222c2274797065223a22636f6e7374727563746f72227d2c7b22696e70757473223a5b5d2c226e616d65223a22676574222c226f757470757473223a5b7b22696e7465726e616c54797065223a22737472696e67222c226e616d65223a22222c2274797065223a22737472696e67227d5d2c2273746174654d75746162696c697479223a2276696577222c2274797065223a2266756e6374696f6e227d2c7b22696e70757473223a5b7b22696e7465726e616c54797065223a22737472696e67222c226e616d65223a226e222c2274797065223a22737472696e67227d5d2c226e616d65223a22736574222c226f757470757473223a5b5d2c2273746174654d75746162696c697479223a226e6f6e70617961626c65222c2274797065223a2266756e6374696f6e227d5d0b2d000020867fc7059f04e9f172202b777673a8413c9e47990dcd09b11311a2f1f5b55a4f3d0001008015e0c4a3a51b5b5b157502aae04f3905bae8daf1389bddf12b0eb7069ead63b76d42383dcd38520df339d571d37ea85334dba126edcc323a98b91e51d32ec074b5f7430ea78c64ccc8d364bf4563dbffb33be503344b72f3384f987c38af98db3f0f00169f2a6545d0920a1a6cb7f338b8b717f03d05fded80ddbbb171a099c1",true],"id":1}' http://127.0.0.1:20200
// Result
{
Expand Down
4 changes: 2 additions & 2 deletions 3.x/zh_CN/docs/introduction/change_log/3_2_2.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# v3.2.2

#### 修复
#### 新增

* 新增交易同步模式开关，支持3.1.x灰度升级至3.2.2版本（[#3678](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3678)）

Expand Down Expand Up @@ -35,7 +35,7 @@
请查阅[完整描述](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/compatibility.html#fisco-bcos-v3-2-2)

| | 推荐版本 | 最低版本 | 说明 |
| ---------- | ----------- | ------------------------ | ---------------------------------- |
|------------|-------------|--------------------------|------------------------------------|
| WeBASE | 3.0.2 | 3.0.2 | |
| WeIdentity | v3.0.0-rc.1 | v3.0.0-rc.1 | |
| Console | 3.2.0 | 3.0.0 | |
Expand Down
108 changes: 108 additions & 0 deletions 3.x/zh_CN/docs/introduction/change_log/3_2_3.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
# v3.2.3

#### 新增

* [新增features功能，支持启用特定bug修复和新功能](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3749)
* [新增轻节点获取所有P2P节点信息接口](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3775)

#### 修改

* [修改核心模块日志等级，减少不必要的error与warning日志](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3787)
* [CI检查设置openjdk版本为1.8.0.345](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3783)
* [修改共识节点在区块落后于最高块时，打印日志](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3744)

#### 修复

* [MemoryStorage::getTxsHash 接口加锁，提升稳定性](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3789)
* [迁移3.4.0版本中对keypage的修复](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3702)
* [完善交易池清理失效交易逻辑，提升稳定性](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3774)
* [完善权限getMethodAuth接口参数为不存在合约的情况](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3823)
* [完善轻节点在国密模式下getBlockByNumber接口](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3750)
* [完善轻节点getAbi接口，提升稳定性](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3768)
* [修复清理打包交易逻辑](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3678)
* [修复同步区块可能出现死锁的问题](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3751)
* [修复交易回滚只回滚一层跨合约调用的问题](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3620)
* [修复存在交易池中且未设置为打包的交易可能出现重复打包的问题](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3755)
* [修复共识checkPoint计时未被重置的问题](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3760)
* [修复对时逻辑在初始化时未对比阈值导致区块打包时间非线性的问题](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3776)
* [修复同步区块时长时间锁等待的问题](https://github.com/FISCO-BCOS/FISCO-BCOS/pull/3807)

#### 升级描述

* 升级节点可执行程序

效果：修复bug，并带来稳定性、性能的提升

操作：停止节点服务，升级节点可执行程序为当前版本，重启节点服务

注意事项：推荐逐步替换可执行程序进行灰度升级

支持升级的版本：v3.0.0+

* 升级链数据版本

效果：可使用当前版本的最新特性

操作：先完成升级所有节点可执行程序，再参考[文档](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/introduction/change_log/3_2_1.html#id5)
发送交易升级链数据版本至 v3.2.3

注意事项：务必备份原节点的所有账本数据，若操作失误造成升级失败，可通过原数据回滚到升级前的状态
支持升级的版本：v3.0.0+

* 组件兼容性

请查阅[完整描述](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/compatibility.html#fisco-bcos-v3-2-2)

| | 推荐版本 | 最低版本 | 说明 |
|------------|-------------|---------------------|-------------------|
| WeBASE | 3.0.2 | 3.0.2 | |
| WeIdentity | v3.0.0-rc.1 | v3.0.0-rc.1 | |
| Console | 3.2.0 | 3.0.0 | |
| Java SDK | 3.2.2 | 3.0.0 | |
| CPP SDK | 3.2.2 | 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.2.0。

```
[group0]: /apps> setSystemConfigByKey compatibility_version 3.2.0
{
"code":0,
"msg":"success"
}
注：若开启权限治理功能，需要使用 setSysConfigProposal 命令
```

设置成功，再次查询，得到当前版本已升级为3.2.0

```
[group0]: /apps> getSystemConfigByKey compatibility_version
3.2.0
```

当前链已经完成升级，至此，**链开始以新的逻辑继续运行**，并支持了新的特性。

5 changes: 4 additions & 1 deletion 3.x/zh_CN/docs/introduction/change_log/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ v3.2.x
------------------

.. admonition:: FISCO BCOS 3.x Releases

- `FISCO BCOS v3.2.3 <./3_2_3.html>`_ [`release <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.2.3>`_]
- `FISCO BCOS v3.2.2 <./3_2_2.html>`_ [`release <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.2.2>`_]
- `FISCO BCOS v3.2.1 <./3_2_1.html>`_ [`release <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.2.1>`_]
- `FISCO BCOS v3.2.0 <./3_2_0.html>`_ [`release <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.2.0>`_]


Expand All @@ -84,6 +86,7 @@ v3.2.x
:hidden:
:maxdepth: 0

3_2_3.md
3_2_2.md
3_2_1.md
3_2_0.md
Expand Down
2 changes: 1 addition & 1 deletion 3.x/zh_CN/docs/operation_and_maintenance/upgrade.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

本文档主要从三个方面讨论FISCO BCOS的升级之路，以解答社区用户在FISCO BCOS实际应用过程中的升级需求。以由易至难、由近至远的思路分为以下三个部分：
- 第一部分，如何实现FISCO BCOS 3.x版本之间的升级；
- 第二部分，如何实现FISCO BCOS三Air、Pro和Max之间升级；
- 第二部分，如何实现FISCO BCOS Air、Pro和Max之间升级；
- 第三部分，如何实现从FISCO BCOS 2.0至3.0的升级。


Expand Down
5 changes: 3 additions & 2 deletions 3.x/zh_CN/docs/sdk/go_sdk/env_conf.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ go-sdk v3依赖bcos-c-sdk动态库，需要先下载bcos-c-sdk动态库，然后
从[这里](https://github.com/FISCO-BCOS/bcos-c-sdk/releases/tag/v3.4.0)下载对应平台的动态库。我们提供了一个脚本，默认下载到`/usr/local/lib`目录下，如果需要下载到其他目录，可以使用脚本的`-o`选项

```bash
./tools/download_csdk_lib.sh -o ./lib
./tools/download_csdk_lib.sh
```

如果将动态库放在`/usr/local/lib`目录下，后续无特殊操作，如果放在自定义的目录下，例如`./lib`，则`go build`需要添加`ldflags`参数，例如`go build -v -ldflags="-r ${PWD}/lib" main.go`。在其他机器使用时也需要通过`export LD_LIBRARY_PATH=${PWD}/lib`设置动态库的搜索路径。
请将动态库放在`/usr/local/lib`目录下，后续无特殊操作。如果本机编译后在其他机器使用时，动态库放置在自定义目录，例如`./lib`，则`go build`需要添加`ldflags`参数，例如`go build -v -ldflags="-r ${PWD}/lib" main.go`。也可以通过`export LD_LIBRARY_PATH=${PWD}/lib`设置动态库的搜索路径。

## 配置

Expand All @@ -49,6 +49,7 @@ type Config struct {
GroupID string // groupID
Host string // 节点IP或域名
Port int // 节点port
DisableSsl bool // 是否禁用ssl
}

func DialContext(ctx context.Context, config *Config) (*Client, error)
Expand Down
2 changes: 1 addition & 1 deletion 3.x/zh_CN/docs/tutorial/max/installation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Max版FISCO BCOS节点采用分布式存储TiKV，执行模块独立成服务，
.. note::
- Max版本FISCO BCOS使用 ``BcosBuilder/max`` 工具进行建链和扩容等相关操作，该工具的介绍请参考 `BcosBuilder <./max_builder.html>`_
- FISCO BCOS 3.x基于tars进行微服务构建和管理，搭建Max版本FISCO BCOS之前，需先安装tars服务，本章介绍了docker版本tars服务的搭建流程，若需要了解更多tars部署、构建相关的信息，请参考 `这里 <https://doc.tarsyun.com/#/markdown/TarsCloud/TarsDocs/installation/README.md>`_
- 本章基于Docker搭建tars服务，请确保拥有 ``root`` 权限
- 本章基于Docker搭建tars服务，请确保系统用户拥有操作docker权限
- 搭建Max版本FISCO BCOS需先部署TiKV集群，TiKV集群的部署请参考 `这里 <https://tikv.org/docs/5.1/deploy/install/install/>`_
```

Expand Down
Loading

0 comments on commit c77ebd5

Please sign in to comment.