c++17 and compiler pinning

.buildkite/pipeline.yml

@@ -1,7 +1,7 @@
 steps:
   - command: | # Amazon Linux 2 Build
         echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
+        ./scripts/eosio_build.sh -y -P -f
         echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build
         if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
@@ -17,14 +17,14 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-3"
         propagate-environment: true
         workdir: /data/job
-    timeout: 60
+    timeout: 120
 
   - command: | # CentOS 7 Build
         echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
+        ./scripts/eosio_build.sh -y -P -f
         echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build
         if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
@@ -40,14 +40,14 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-3"
         propagate-environment: true
         workdir: /data/job
-    timeout: 60
+    timeout: 120
 
   - command: | # Ubuntu 16.04 Build
         echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
+        ./scripts/eosio_build.sh -y -P -f
         echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build
         if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
@@ -63,14 +63,14 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-3"
         propagate-environment: true
         workdir: /data/job
-    timeout: 60
+    timeout: 120
 
   - command: | # Ubuntu 18.04 Build
         echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
+        ./scripts/eosio_build.sh -y -P -f
         echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build
         if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
@@ -86,18 +86,18 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-3"
         propagate-environment: true
         workdir: /data/job
-    timeout: 60
+    timeout: 120
 
   - command: | # macOS Mojave Build
       echo "--- Creating symbolic link to job directory :file_folder:"
       sleep 5
       ln -s "$(pwd)" /data/job
       cd /data/job
       echo "+++ Building :hammer:"
-      ./scripts/eosio_build.sh -y
+      ./scripts/eosio_build.sh -y -P -f
       echo "--- Compressing build directory :compression:"
       tar -pczf build.tar.gz build
       if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
@@ -106,7 +106,7 @@ steps:
       - "role=builder-v2-1"
       - "os=mojave"
     artifact_paths: "build.tar.gz"
-    timeout: 60
+    timeout: 120
 
   - wait
 
@@ -127,7 +127,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-3"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -148,7 +148,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-3"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -170,7 +170,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-3"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -191,7 +191,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-3"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -213,7 +213,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-3"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -234,7 +234,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-3"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -256,7 +256,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-3"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -277,7 +277,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-3"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -336,7 +336,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-3"
         propagate-environment: true
         workdir: /data/job
     env:
@@ -364,7 +364,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-3"
         propagate-environment: true
         workdir: /data/job
     env:
@@ -392,7 +392,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-3"
         propagate-environment: true
         workdir: /data/job
     env:
@@ -435,4 +435,4 @@ steps:
     label: "Git Submodule Regression Check"
     agents:
       queue: "automation-large-builder-fleet"
-    timeout: 5
+    timeout: 5

.pipelinebranch

@@ -1 +1 @@
-use-protocol-features-sync-nodes
+protocol-features-sync-nodes

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 3.5 )
+cmake_minimum_required( VERSION 3.8 )
 
 project( EOSIO )
 include(CTest) # suppresses DartConfiguration.tcl error
@@ -25,7 +25,7 @@ include( InstallDirectoryPermissions )
 include( MASSigning )
 
 set( BLOCKCHAIN_NAME "EOSIO" )
-set( CMAKE_CXX_STANDARD 14 )
+set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
@@ -49,15 +49,15 @@ set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )
 
 # http://stackoverflow.com/a/18369825
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-        message(FATAL_ERROR "GCC version must be at least 6.0!")
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
+        message(FATAL_ERROR "GCC version must be at least 7.0!")
     endif()
     if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
        add_compile_options(-fdiagnostics-color=always)
     endif()
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
-        message(FATAL_ERROR "Clang version must be at least 4.0!")
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+        message(FATAL_ERROR "Clang version must be at least 5.0!")
     endif()
     if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
        add_compile_options(-fcolor-diagnostics)
@@ -112,12 +112,10 @@ FIND_PACKAGE(Boost 1.67 REQUIRED COMPONENTS
     unit_test_framework
     iostreams)
 
-# Some new stdlibc++s will #error on <experimental/string_view>; a problem for boost pre-1.69
-if( APPLE AND UNIX )
-   add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
-endif()
+add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
 
-set(THREADS_PREFER_PTHREAD_FLAG 1)
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads)
 link_libraries(Threads::Threads)
 
@@ -159,11 +157,11 @@ else( WIN32 ) # Apple AND Linux
     if( APPLE )
         # Apple Specific Options Here
         message( STATUS "Configuring EOSIO on OS X" )
-        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations" )
+        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations" )
     else( APPLE )
         # Linux Specific Options Here
         message( STATUS "Configuring EOSIO on Linux" )
-        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall" )
+        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall" )
         if ( FULL_STATIC_BUILD )
           set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
         endif ( FULL_STATIC_BUILD )

libraries/wasm-jit/CMakeLists.txt

@@ -36,6 +36,7 @@ include_directories(${WAVM_INCLUDE_DIR})
 #		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
 #	endif()
 
+set(CMAKE_CXX_STANDARD 11)
 option(WAVM_METRICS_OUTPUT "controls printing the timings of some operations to stdout" OFF)
 if(WAVM_METRICS_OUTPUT)
 	add_definitions("-DWAVM_METRICS_OUTPUT=1")

plugins/wallet_plugin/include/eosio/wallet_plugin/se_wallet.hpp

@@ -32,10 +32,10 @@ class se_wallet final : public wallet_api {
       string create_key(string key_type) override;
       bool remove_key(string key) override;
 
-      optional<signature_type> try_sign_digest(const digest_type digest, const public_key_type public_key) override;
+      fc::optional<signature_type> try_sign_digest(const digest_type digest, const public_key_type public_key) override;
 
    private:
       std::unique_ptr<detail::se_wallet_impl> my;
 };
 
-}}
+}}

plugins/wallet_plugin/include/eosio/wallet_plugin/wallet.hpp

@@ -181,7 +181,7 @@ class soft_wallet final : public wallet_api
 
       /* Attempts to sign a digest via the given public_key
       */
-      optional<signature_type> try_sign_digest( const digest_type digest, const public_key_type public_key ) override;
+      fc::optional<signature_type> try_sign_digest( const digest_type digest, const public_key_type public_key ) override;
 
       std::shared_ptr<detail::soft_wallet_impl> my;
       void encrypt_keys();

plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_api.hpp

@@ -101,7 +101,7 @@ class wallet_api
 
       /** Returns a signature given the digest and public_key, if this wallet can sign via that public key
        */
-      virtual optional<signature_type> try_sign_digest( const digest_type digest, const public_key_type public_key ) = 0;
+      virtual fc::optional<signature_type> try_sign_digest( const digest_type digest, const public_key_type public_key ) = 0;
 };
 
 }}

plugins/wallet_plugin/include/eosio/wallet_plugin/yubihsm_wallet.hpp

@@ -32,10 +32,10 @@ class yubihsm_wallet final : public wallet_api {
       string create_key(string key_type) override;
       bool remove_key(string key) override;
 
-      optional<signature_type> try_sign_digest(const digest_type digest, const public_key_type public_key) override;
+      fc::optional<signature_type> try_sign_digest(const digest_type digest, const public_key_type public_key) override;
 
    private:
       std::unique_ptr<detail::yubihsm_wallet_impl> my;
 };
 
-}}
+}}

plugins/wallet_plugin/se_wallet.cpp

@@ -186,10 +186,10 @@ struct se_wallet_impl {
       return pub;
    }
 
-   optional<signature_type> try_sign_digest(const digest_type d, const public_key_type public_key) {
+   fc::optional<signature_type> try_sign_digest(const digest_type d, const public_key_type public_key) {
       auto it = _keys.find(public_key);
       if(it == _keys.end())
-         return optional<signature_type>{};
+         return fc::optional<signature_type>{};
 
       fc::ecdsa_sig sig = ECDSA_SIG_new();
       CFErrorRef error = nullptr;
@@ -370,8 +370,8 @@ bool se_wallet::remove_key(string key) {
    return my->remove_key(key);
 }
 
-optional<signature_type> se_wallet::try_sign_digest(const digest_type digest, const public_key_type public_key) {
+fc::optional<signature_type> se_wallet::try_sign_digest(const digest_type digest, const public_key_type public_key) {
    return my->try_sign_digest(digest, public_key);
 }
 
-}}
+}}

plugins/wallet_plugin/wallet.cpp

@@ -120,18 +120,18 @@ class soft_wallet_impl
 
    string get_wallet_filename() const { return _wallet_filename; }
 
-   optional<private_key_type>  try_get_private_key(const public_key_type& id)const
+   fc::optional<private_key_type>  try_get_private_key(const public_key_type& id)const
    {
       auto it = _keys.find(id);
       if( it != _keys.end() )
          return  it->second;
-      return optional<private_key_type>();
+      return fc::optional<private_key_type>();
    }
 
-   optional<signature_type> try_sign_digest( const digest_type digest, const public_key_type public_key ) {
+   fc::optional<signature_type> try_sign_digest( const digest_type digest, const public_key_type public_key ) {
       auto it = _keys.find(public_key);
       if( it == _keys.end() )
-         return optional<signature_type>{};
+         return fc::optional<signature_type>{};
       return it->second.sign(digest);
    }
 
@@ -401,7 +401,7 @@ private_key_type soft_wallet::get_private_key( public_key_type pubkey )const
    return my->get_private_key( pubkey );
 }
 
-optional<signature_type> soft_wallet::try_sign_digest( const digest_type digest, const public_key_type public_key ) {
+fc::optional<signature_type> soft_wallet::try_sign_digest( const digest_type digest, const public_key_type public_key ) {
    return my->try_sign_digest(digest, public_key);
 }
 

plugins/wallet_plugin/wallet_manager.cpp

@@ -237,7 +237,7 @@ wallet_manager::sign_transaction(const chain::signed_transaction& txn, const fla
       bool found = false;
       for (const auto& i : wallets) {
          if (!i.second->is_locked()) {
-            optional<signature_type> sig = i.second->try_sign_digest(stxn.sig_digest(id, stxn.context_free_data), pk);
+            fc::optional<signature_type> sig = i.second->try_sign_digest(stxn.sig_digest(id, stxn.context_free_data), pk);
             if (sig) {
                stxn.signatures.push_back(*sig);
                found = true;
@@ -260,7 +260,7 @@ wallet_manager::sign_digest(const chain::digest_type& digest, const public_key_t
    try {
       for (const auto& i : wallets) {
          if (!i.second->is_locked()) {
-            optional<signature_type> sig = i.second->try_sign_digest(digest, key);
+            fc::optional<signature_type> sig = i.second->try_sign_digest(digest, key);
             if (sig)
                return *sig;
          }