merge v2.0.1 version (EOSIO#36)

.buildkite/pipeline.yml

@@ -442,7 +442,7 @@ steps:
         cd /data/job/build/packages && bash generate_package.sh deb
     label: ":ubuntu: 18.04 Package builder"
     agents:
-      - "role=linux-builder"
+      queue: "automation-large-builder-fleet"
     artifact_paths:
       - "build/packages/*.deb"
     plugins:
@@ -469,7 +469,7 @@ steps:
         cd /data/job/build/packages && bash generate_package.sh rpm
     label: ":fedora: Package builder"
     agents:
-      - "role=linux-builder"
+      queue: "automation-large-builder-fleet"
     artifact_paths:
       - "build/packages/x86_64/*.rpm"
     plugins:
@@ -496,7 +496,7 @@ steps:
         cd /data/job/build/packages && bash generate_package.sh rpm
     label: ":centos: Package builder"
     agents:
-      - "role=linux-builder"
+      queue: "automation-large-builder-fleet"
     artifact_paths:
       - "build/packages/x86_64/*.rpm"
     plugins:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,20 +1,20 @@
 <!-- PLEASE FILL OUT THE FOLLOWING MARKDOWN TEMPLATE -->
 <!-- Give your PR a title that is sufficient to understand what is being changed. -->
 
-**Change Description**
+## Change Description
 
 <!-- Describe the change you made, the motivation for it, and the impact it will have. Reference issues or pull requests where possible (use '#XX' or 'GH-XX' where XX is the issue or pull request number). -->
 
-**Consensus Changes**
+## Consensus Changes
 
 <!-- If this PR introduces a change to the validation of blocks in the chain or consensus in general, please describe the impact. -->
 
 
-**API Changes**
+## API Changes
 
 <!-- If this PR introduces API changes, please describe the changes here. What will developers need to know before upgrading to this version? -->
 
 
-**Documentation Additions**
+## Documentation Additions
 
 <!-- List all the information that needs to be added to the documentation after merge. -->

CMakeLists.txt

@@ -33,9 +33,15 @@ set( CMAKE_CXX_STANDARD 14 )
 set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
-set(VERSION_MAJOR 1)
+set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 3)
+set(VERSION_PATCH 1)
+
+if(VERSION_SUFFIX)
+    set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")
+else()
+    set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+endif()
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )

CMakeModules/EosioTester.cmake.in

@@ -1,10 +1,10 @@
 cmake_minimum_required( VERSION 3.5 )
-message(STATUS "Setting up Eosio Tester @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ at @EOS_ROOT_DIR@")
+message(STATUS "Setting up Eosio Tester @VERSION_FULL@ at @EOS_ROOT_DIR@")
 
 set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
 set(CMAKE_C_COMPILER   @CMAKE_C_COMPILER@)
 
-set(EOSIO_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@")
+set(EOSIO_VERSION "@VERSION_FULL@")
 
 enable_testing()
 

CMakeModules/EosioTesterBuild.cmake.in

@@ -1,10 +1,10 @@
 cmake_minimum_required( VERSION 3.5 )
-message(STATUS "Setting up Eosio Tester @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ at @EOS_ROOT_DIR@")
+message(STATUS "Setting up Eosio Tester @VERSION_FULL@ at @EOS_ROOT_DIR@")
 
 set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
 set(CMAKE_C_COMPILER   @CMAKE_C_COMPILER@)
 
-set(EOSIO_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@")
+set(EOSIO_VERSION "@VERSION_FULL@")
 
 enable_testing()
 
@@ -98,8 +98,8 @@ macro(add_eosio_test test_name)
        ${liblogging}
        ${libchainbase}
        ${libbuiltins}
-       ${GMP_LIBRARIES}
        ${libsecp256k1}
+       ${GMP_LIBRARIES}
 
        LLVMX86Disassembler
        LLVMX86AsmParser

CMakeModules/doxygen.cmake

@@ -5,7 +5,7 @@ include(FindDoxygen)
 if(NOT DOXYGEN_FOUND)
   message(STATUS "Doxygen not found.  Contract documentation will not be generated.")
 else()
-  set(DOXY_EOS_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.")
+  set(DOXY_EOS_VERSION "${VERSION_FULL}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.")
   # CMake strips trailing path separators off of variables it knows are paths,
   # so the trailing '/' Doxygen expects is embedded in the doxyfile.
   set(DOXY_DOC_DEST_DIR "${CMAKE_BINARY_DIR}/docs" CACHE PATH "Path to the doxygen output")

Docker/Dockerfile

@@ -10,7 +10,8 @@ RUN git clone -b $branch https://github.com/boscore/bos.git --recursive \
     && cmake -H. -B"/tmp/build" -GNinja -DCMAKE_BUILD_TYPE=Release -DWASM_ROOT=/opt/wasm -DCMAKE_CXX_COMPILER=clang++ \
        -DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/tmp/build -DBUILD_MONGO_DB_PLUGIN=true -DCORE_SYMBOL_NAME=$symbol \
        -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" \
-    && cmake --build /tmp/build --target install && rm /tmp/build/bin/eosiocpp
+    && cmake --build /tmp/build --target install
+
 
 
 FROM ubuntu:18.04

Docker/README.md

@@ -17,13 +17,14 @@ Simple and fast setup of BOSCore on Docker is also available.
 ```bash
 git clone https://github.com/boscore/bos.git --recursive  --depth 1
 cd bos/Docker
-docker build . -t boscore/bos
+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 v1.0.3 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.1 tag, you could do the following:
 
 ```bash
-docker build -t boscore/bos:v1.0.3 --build-arg branch=v1.0.3 .
+docker build -t boscore/bos:v2.0.1 --build-arg branch=v2.0.1 .
+
 ```
 
 By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.

README.md

@@ -1,7 +1,7 @@
 # BOSCore - Born for DApps. Born for Usability.
 
-## BOSCore Version: v1.0.3
-### Basic EOSIO Version: v1.4.4
+## BOSCore Version: v2.0.1
+### Basic EOSIO Version: v1.5.3-patched
 
 # 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.
@@ -20,14 +20,16 @@ As BOS continues to develop, developer rewards will be appropriately adjusted to
 
 ## Links
 1. [Website](https://boscore.io)
-2. [Developer Telegram Group](https://t.me/BOSCoreDev)
-3. [WhitePaper](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper.md)
-4. [白皮书](https://github.com/boscore/Documentation/blob/master/zh-CN/BOSCoreTechnicalWhitePaper.md)
+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)
 
 ## Start
 1. Build from code : `bash ./eosio_build.sh -s BOS`
 2. Docker Style，check [Docker](./Docker/README.md)
 
+
 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: v1.0.3
-### Basic EOSIO Version: v1.4.4
+## BOSCore Version: v2.0.1
+### Basic EOSIO Version: v1.5.3-patched
 
 # 背景
 EOS的出现给区块链带来了新的想象力，主网启动短短几个月以来，版本经历了几十次升级，不仅稳定性得到了很大提高，并且新功能也逐步实现，各个节点团队也积极参与建设EOSIO生态。让人更加兴奋的是，EOS已经吸引了越来越多的开发团队，当前已经有数百个DApp在EOS主网上面运行，其交易量和流通市值远超以太坊，可发展的空间愈来愈广阔。
@@ -20,9 +20,10 @@ BOS链的代码完全由社区贡献并维护，每个生态参与者都可以
 
 ## 资源
 1. [官网](https://boscore.io)
-2. [开发者社群](https://t.me/BOSCoreDev)
-3. [WhitePaper](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper.md)
-4. [白皮书](https://github.com/boscore/Documentation/blob/master/zh-CN/BOSCoreTechnicalWhitePaper.md)
+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)
 
 ## 开始
 1. 源码直接编译: `bash ./eosio_build.sh -s BOS`

contracts/CMakeLists.txt

@@ -7,7 +7,6 @@ set(STANDARD_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts ${CMAKE_BINARY_DIR}/c
 add_subdirectory(eosiolib)
 add_subdirectory(musl)
 add_subdirectory(libc++)
-add_subdirectory(simple.token)
 add_subdirectory(eosio.token)
 add_subdirectory(eosio.msig)
 add_subdirectory(eosio.sudo)
@@ -18,17 +17,14 @@ add_subdirectory(identity)
 add_subdirectory(stltest)
 add_subdirectory(test.inline)
 
-#add_subdirectory(bancor)
 add_subdirectory(hello)
 add_subdirectory(asserter)
-add_subdirectory(infinite)
 add_subdirectory(proxy)
 add_subdirectory(test_api)
 add_subdirectory(test_api_mem)
 add_subdirectory(test_api_db)
 add_subdirectory(test_api_multi_index)
 add_subdirectory(test_ram_limit)
-#add_subdirectory(social)
 add_subdirectory(eosio.bios)
 add_subdirectory(noop)
 add_subdirectory(tic_tac_toe)