Merge pull request #6433 from EOSIO/release/1.5.x

Release 1.5.0
EOSIO · Dec 4, 2018 · ea08cfd · ea08cfd
2 parents 59626f1 + 49bb38e
commit ea08cfd
Show file tree

Hide file tree

Showing 152 changed files with 4,100 additions and 59,521 deletions.
diff --git a/.buildkite/pipeline.yml b/.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:

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.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. -->
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,8 +34,14 @@ set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 4)
-set(VERSION_PATCH 4)
+set(VERSION_MINOR 5)
+set(VERSION_PATCH 0)
+
+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 )

diff --git a/CMakeModules/EosioTester.cmake.in b/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()
 
@@ -97,8 +97,8 @@ macro(add_eosio_test test_name)
        ${liblogging}
        ${libchainbase}
        ${libbuiltins}
-       ${GMP_LIBRARIES}
        ${libsecp256k1}
+       ${GMP_LIBRARIES}
 
        LLVMX86Disassembler
        LLVMX86AsmParser

diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/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

diff --git a/CMakeModules/doxygen.cmake b/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")

diff --git a/Docker/Dockerfile b/Docker/Dockerfile
@@ -6,7 +6,7 @@ RUN git clone -b $branch https://github.com/EOSIO/eos.git --recursive \
     && cd eos && echo "$branch:$(git rev-parse HEAD)" > /etc/eosio-version \
     && 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 \
-    && cmake --build /tmp/build --target install && rm /tmp/build/bin/eosiocpp
+    && cmake --build /tmp/build --target install
 
 
 FROM ubuntu:18.04

diff --git a/Docker/README.md b/Docker/README.md
@@ -20,10 +20,10 @@ cd eos/Docker
 docker build . -t eosio/eos
 ```
 
-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.4.4 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 v1.5.0 tag, you could do the following:
 
 ```bash
-docker build -t eosio/eos:v1.4.4 --build-arg branch=v1.4.4 .
+docker build -t eosio/eos:v1.5.0 --build-arg branch=v1.5.0 .
 ```
 
 By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.

diff --git a/README.md b/README.md
@@ -39,31 +39,31 @@ $ brew remove eosio
 ```
 #### Ubuntu 18.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.4.4/eosio_1.4.4-1-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_1.4.4-1-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.5.0/eosio_1.5.0-1-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_1.5.0-1-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.4.4/eosio_1.4.4-1-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_1.4.4-1-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.5.0/eosio_1.5.0-1-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_1.5.0-1-ubuntu-16.04_amd64.deb
 ```
 #### Debian Package Uninstall
 ```sh
 $ sudo apt remove eosio
 ```
 #### Centos RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.4.4/eosio-1.4.4-1.el7.x86_64.rpm
-$ sudo yum install ./eosio-1.4.4-1.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v1.5.0/eosio-1.5.0-1.el7.x86_64.rpm
+$ sudo yum install ./eosio-1.5.0-1.el7.x86_64.rpm
 ```
 #### Centos RPM Package Uninstall
 ```sh
 $ sudo yum remove eosio.cdt
 ```
 #### Fedora RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.4.4/eosio-1.4.4-1.fc27.x86_64.rpm
-$ sudo yum install ./eosio-1.4.4-1.fc27.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v1.5.0/eosio-1.5.0-1.fc27.x86_64.rpm
+$ sudo yum install ./eosio-1.5.0-1.fc27.x86_64.rpm
 ```
 #### Fedora RPM Package Uninstall
 ```sh

diff --git a/contracts/CMakeLists.txt b/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)

diff --git a/contracts/bancor/CMakeLists.txt b/contracts/bancor/CMakeLists.txt
diff --git a/contracts/bancor/bancor.cpp b/contracts/bancor/bancor.cpp
diff --git a/contracts/bancor/bancor.hpp b/contracts/bancor/bancor.hpp