Merge rex

CMakeLists.txt

@@ -35,7 +35,7 @@ set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

Docker/README.md

@@ -20,10 +20,10 @@ cd bos/Docker
 docker build . -t boscore/bos -s BOS
 ```
 
-The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v2.0.2 tag, you could do the following:
+The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v2.0.3 tag, you could do the following:
 
 ```bash
-docker build -t boscore/bos:v2.0.2 --build-arg branch=v2.0.2 .
+docker build -t boscore/bos:v2.0.3 --build-arg branch=v2.0.3 .
 
 ```
 

README.md

@@ -1,7 +1,7 @@
 # BOSCore - Born for DApps. Born for Usability.
 
-## BOSCore Version: v2.0.2
-### Basic EOSIO Version: v1.6.2
+## BOSCore Version: v2.0.3
+### Basic EOSIO Version: v1.6.4 (support REX)
 
 # Background
 The emergence of EOS has brought new imagination to the blockchain. In just a few months since the main network was launched, the version has undergone dozens of upgrades, not only the stability has been greatly improved, but also the new functions have been gradually realized. The node team is also actively involved in building the EOSIO ecosystem. What is even more exciting is that EOS has attracted more and more development teams. There are already hundreds of DApp running on the EOS main network. The transaction volume and circulation market value far exceed Ethereum, and the space for development is growing broader.
@@ -23,7 +23,7 @@ As BOS continues to develop, developer rewards will be appropriately adjusted to
 2. [Developer Telegram Group](https://t.me/BOSDevelopers)
 3. [Community Telegram Group](https://t.me/boscorecommunity)
 4. [WhitePaper](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper.md)
-5. [白皮书](https://github.com/boscore/Documentation/blob/master/zh-CN/BOSCoreTechnicalWhitePaper.md)
+5. [白皮书](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper_zh.md)
 
 ## Start
 1. Build from code : `bash ./eosio_build.sh -s BOS`
@@ -39,6 +39,16 @@ Attention:
 3. Treat update of eosio/eos code as new feature.
 4. Emergent issues must repaired by adopting hotfixes mode.
 
+## BOSCore Workflow
+BOSCore encourage community developer actively participate in contributing the code, members should follow the workflow below.
+![BOSCore Workflow](./images/bos-workflow.png)
+
+Attention: 
+1. Only allow Feature Branch or bug fix to submit PR to Develop Branch.
+2. Rebase is required before submitting PR to Develop Branch.
+3. Treat update of eosio/eos code as new feature.
+4. Emergent issues must repaired by adopting hotfixes mode.
+
 BOSCore bases on EOSIO, so you can also referer:
 
 [Getting Started](https://developers.eos.io/eosio-nodeos/docs/overview-1)  

README_CN.md

@@ -1,7 +1,7 @@
 # BOSCore - 更可用的链，为DApp而生。
 
-## BOSCore Version: v2.0.2
-### Basic EOSIO Version: v1.6.2
+## BOSCore Version: v2.0.3
+### Basic EOSIO Version: v1.6.4 (support REX)
 
 # 背景
 EOS的出现给区块链带来了新的想象力，主网启动短短几个月以来，版本经历了几十次升级，不仅稳定性得到了很大提高，并且新功能也逐步实现，各个节点团队也积极参与建设EOSIO生态。让人更加兴奋的是，EOS已经吸引了越来越多的开发团队，当前已经有数百个DApp在EOS主网上面运行，其交易量和流通市值远超以太坊，可发展的空间愈来愈广阔。
@@ -23,7 +23,7 @@ BOS链的代码完全由社区贡献并维护，每个生态参与者都可以
 2. [Developer Telegram Group](https://t.me/BOSDevelopers)
 3. [Community Telegram Group](https://t.me/boscorecommunity)
 4. [WhitePaper](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper.md)
-5. [白皮书](https://github.com/boscore/Documentation/blob/master/zh-CN/BOSCoreTechnicalWhitePaper.md)
+5. [白皮书](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper_zh.md)
 
 ## 开始
 1. 源码直接编译: `bash ./eosio_build.sh -s BOS`
@@ -39,6 +39,16 @@ BOSCore 鼓励社区开发者参与代码贡献，社区成员应当遵循以下
 3. EOSIO 主网版本作为一个 Feature Branch 来对待
 4. 紧急问题修复采用 hotfixes 模式 
 
+## BOSCore 开发流程 
+BOSCore 鼓励社区开发者参与代码贡献，社区成员应当遵循以下工作流：
+![BOSCore Workflow](./images/bos-workflow.png)
+
+注意:
+1. 只有待发布的 Feature Branch 或者Bug修复才应该向 Develop Branch 提交
+2. 向 Develop Branch 提交 PR 之前需要现在本地执行 rebase 操作
+3. EOSIO 主网版本作为一个 Feature Branch 来对待
+4. 紧急问题修复采用 hotfixes 模式 
+
 BOSCore是基于EOSIO技术的扩展，所以EOSIO的相关资料也可以参考： 
 
 [EOSIO 开始](https://developers.eos.io/eosio-nodeos/docs/overview-1)