diff --git a/Docker/README.md b/Docker/README.md index 5be2cbe6a1f..fe8486e7dc5 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -198,4 +198,5 @@ The `blocks` data are stored under `--data-dir` by default, and the wallet files ### About MongoDB Plugin -Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file. \ No newline at end of file +Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file. + diff --git a/README.md b/README.md index 6387dc0e7ea..75e3c252bc5 100644 --- a/README.md +++ b/README.md @@ -28,16 +28,6 @@ As BOS continues to develop, developer rewards will be appropriately adjusted to ## Start 1. Build from code : `bash ./eosio_build.sh -s BOS` 2. Docker Style,check [Docker](./Docker/README.md) -3. Mac OS X Brew install and uninstall -#### Mac OS X Brew Install -```sh -$ brew tap boscore/bos -$ brew install bos -``` -#### Mac OS X Brew Uninstall -```sh -$ brew remove bos -``` ## BOSCore Workflow BOSCore encourage community developer actively participate in contributing the code, members should follow the workflow below. @@ -55,3 +45,4 @@ BOSCore bases on EOSIO, so you can also referer: [EOSIO Developer Portal](https://developers.eos.io). + diff --git a/README_CN.md b/README_CN.md index dbc1f27b2bf..6d09fb6c36c 100644 --- a/README_CN.md +++ b/README_CN.md @@ -28,16 +28,6 @@ BOS链的代码完全由社区贡献并维护,每个生态参与者都可以 ## 开始 1. 源码直接编译: `bash ./eosio_build.sh -s BOS` 2. Docker方式部署,参看 [Docker](./Docker/README.md) -3. Mac OS X Brew 安装 和 卸载 -#### Mac OS X Brew 安装 -```sh -$ brew tap boscore/bos -$ brew install bos -``` -#### Mac OS X Brew 卸载 -```sh -$ brew remove bos -``` ## BOSCore 开发流程 BOSCore 鼓励社区开发者参与代码贡献,社区成员应当遵循以下工作流: @@ -55,3 +45,4 @@ BOSCore是基于EOSIO技术的扩展,所以EOSIO的相关资料也可以参考 [EOSIO 开发者门户](https://developers.eos.io). + diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp index 72975fd4bf9..b582e6ee40c 100644 --- a/libraries/chain/controller.cpp +++ b/libraries/chain/controller.cpp @@ -1945,6 +1945,7 @@ void controller::abort_block() { boost::asio::thread_pool& controller::get_thread_pool() { return my->thread_pool; + } std::future controller::create_block_state_future( const signed_block_ptr& b ) {