Pull from upstream

.buildkite/coverage.yml

@@ -1,7 +1,7 @@
 steps:
   - command: |
         echo "--- :hammer: Building" && \
-        /usr/bin/cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++-4.0 -DCMAKE_C_COMPILER=clang-4.0 -DWASM_ROOT=/root/opt/wasm -DOPENSSL_ROOT_DIR=/usr/include/openssl -DBUILD_MONGO_DB_PLUGIN=true -DENABLE_COVERAGE_TESTING=true -DBUILD_DOXYGEN=false && \
+        /usr/bin/cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++-4.0 -DCMAKE_C_COMPILER=clang-4.0 -DBOOST_ROOT="${BOOST_ROOT}" -DWASM_ROOT="${WASM_ROOT}" -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBUILD_MONGO_DB_PLUGIN=true -DENABLE_COVERAGE_TESTING=true -DBUILD_DOXYGEN=false && \
         /usr/bin/ninja
         echo "--- :spiral_note_pad: Generating Code Coverage Report" && \
         /usr/bin/ninja EOSIO_ut_coverage && \
@@ -15,13 +15,13 @@ steps:
     agents:
       - "role=linux-coverage"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
         mounts:
           - /etc/buildkite-agent/config:/config
         environment:
-          - BOOST_ROOT=/root/opt/boost_1_67_0
+          - BOOST_ROOT=/root/opt/boost
           - OPENSSL_ROOT_DIR=/usr/include/openssl
           - WASM_ROOT=/root/opt/wasm
           - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/wasm/bin

.buildkite/debug.yml

@@ -22,7 +22,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -37,7 +37,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -52,7 +52,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -67,7 +67,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -82,7 +82,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
@@ -128,7 +128,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -152,7 +152,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -176,7 +176,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -200,7 +200,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -224,7 +224,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60

.buildkite/long_running_tests.yml

@@ -22,7 +22,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -37,7 +37,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -52,7 +52,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -67,7 +67,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -82,7 +82,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
@@ -128,7 +128,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -152,7 +152,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -176,7 +176,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -200,7 +200,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -224,7 +224,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60

.buildkite/pipeline.yml

@@ -22,7 +22,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -37,7 +37,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -52,7 +52,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -67,7 +67,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -82,7 +82,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
@@ -128,7 +128,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -152,7 +152,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -176,7 +176,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -200,7 +200,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -224,7 +224,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60

CMakeLists.txt

@@ -26,10 +26,12 @@ set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 1)
-set(VERSION_PATCH 4)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 3)
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
+set( NODE_EXECUTABLE_NAME nodeos )
+set( KEY_STORE_EXECUTABLE_NAME keosd )
 set( GUI_CLIENT_EXECUTABLE_NAME eosio )
 set( CUSTOM_URL_SCHEME "gcs" )
 set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )