Merge pull request #3 from pmconrad/master

Update + Boost-compatibility (1.61+1.62)

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "vendor/diff-match-patch-cpp-stl"]
-	path = vendor/diff-match-patch-cpp-stl
-	url = https://github.com/leutloff/diff-match-patch-cpp-stl
-[submodule "vendor/websocketpp"]
-	path = vendor/websocketpp
-	url = https://github.com/zaphoyd/websocketpp.git
 [submodule "vendor/secp256k1-zkp"]
 	path = vendor/secp256k1-zkp
 	url = https://github.com/cryptonomex/secp256k1-zkp.git
+[submodule "vendor/websocketpp"]
+    path = vendor/websocketpp
+    url = https://github.com/zaphoyd/websocketpp.git
+[submodule "vendor/diff-match-patch-cpp-stl"]
+	path = vendor/diff-match-patch-cpp-stl
+	url = https://github.com/leutloff/diff-match-patch-cpp-stl

CMakeLists.txt

@@ -170,6 +170,7 @@ set( fc_sources
      src/thread/mutex.cpp
      src/thread/non_preemptable_scope_check.cpp
      src/asio.cpp
+     src/stacktrace.cpp
      src/string.cpp
      src/shared_ptr.cpp
      src/time.cpp
@@ -187,10 +188,12 @@ set( fc_sources
      src/interprocess/signals.cpp
      src/interprocess/file_mapping.cpp
      src/interprocess/mmap_struct.cpp
+     src/interprocess/file_mutex.cpp
      src/rpc/cli.cpp
      src/rpc/http_api.cpp
      src/rpc/json_connection.cpp
      src/rpc/state.cpp
+     src/rpc/bstate.cpp
      src/rpc/websocket_api.cpp
      src/log/log_message.cpp
      src/log/logger.cpp
@@ -218,12 +221,13 @@ set( fc_sources
      src/crypto/dh.cpp
      src/crypto/blowfish.cpp
      src/crypto/elliptic_common.cpp
+     src/crypto/equihash.cpp
+     src/crypto/restartable_sha256.cpp
      ${ECC_REST}
      src/crypto/elliptic_${ECC_IMPL}.cpp
      src/crypto/rand.cpp
      src/network/tcp_socket.cpp
      src/network/udp_socket.cpp
-     src/network/udt_socket.cpp
      src/network/http/http_connection.cpp
      src/network/http/http_server.cpp
      src/network/http/websocket.cpp
@@ -250,7 +254,7 @@ list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp")
 list(APPEND sources ${fc_headers})
 
 add_subdirectory( vendor/websocketpp )
-add_subdirectory( vendor/udt4 )
+add_subdirectory( vendor/equihash )
 
 setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC DONT_INSTALL_LIBRARY )
 
@@ -273,6 +277,10 @@ if(WIN32)
 endif(WIN32)
 # end readline stuff
 
+if( NOT CPP_STANDARD )
+  set( CPP_STANDARD, "-std=c++11" )
+endif()
+
 IF(WIN32)
   target_compile_definitions(fc PUBLIC WIN32 NOMINMAX _WIN32_WINNT=0x0501 _CRT_SECURE_NO_WARNINGS
     _SCL_SERCURE_NO_WARNINGS
@@ -294,40 +302,81 @@ ELSE()
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
 
   IF(APPLE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -stdlib=libc++ -Wall")
   ELSE()
     if( NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
-      target_compile_options(fc PUBLIC -std=c++11 -Wall -fnon-call-exceptions)
+      target_compile_options(fc PUBLIC ${CPP_STANDARD} -Wall -fnon-call-exceptions)
     endif()
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fnon-call-exceptions")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -Wall -fnon-call-exceptions")
   ENDIF()
 ENDIF()
 
+IF(APPLE)
+  # As of 10.10 yosemite, the OpenSSL static libraries shipped with os x have a dependency
+  # on zlib, so any time you link in openssl you also need to link zlib.  .  We really want to detect whether openssl was configured with the --no-zlib
+  # option or not when it was built, but that's difficult to do in practice, so we
+  # just always try to link it in on mac.
+  find_package( ZLIB REQUIRED )
+ELSE(APPLE)
+  find_package( ZLIB )
+ENDIF(APPLE)
+
+if( ZLIB_FOUND )
+  MESSAGE( STATUS "zlib found" )
+  add_definitions( -DHAS_ZLIB )
+else()
+  MESSAGE( STATUS "zlib not found" )
+  set( ZLIB_LIBRARIES "" )
+endif( ZLIB_FOUND )
+
+find_package( BZip2 )
+if( BZIP2_FOUND )
+   MESSAGE( STATUS "bzip2 found" )
+   add_definitions( -DHAS_BZIP2 )
+else()
+   MESSAGE( STATUS "bzip2 not found" )
+   set( BZIP2_LIBRARIES "" )
+endif( BZIP2_FOUND )
+
 # This will become unnecessary once we update to websocketpp which fixes upstream issue #395
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBSOCKETPP_STRICT_MASKING")
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_ASIO_HAS_STD_CHRONO")
 
+OPTION( LOG_LONG_API "Log long API calls over websocket (ON OR OFF)" ON )
+MESSAGE( STATUS "LOG_LONG_API: ${LOG_LONG_API}" )
+if( LOG_LONG_API )
+  SET( LOG_LONG_API_MAX_MS 1000 CACHE STRING "Max API execution time in ms" )
+  SET( LOG_LONG_API_WARN_MS 750 CACHE STRING "API execution time in ms at which to warn" )
+  MESSAGE( STATUS "     " )
+  MESSAGE( STATUS "     LOGGING LONG API CALLS" )
+  MESSAGE( STATUS "          MAX  MS: ${LOG_LONG_API_MAX_MS}" )
+  MESSAGE( STATUS "          WARN MS: ${LOG_LONG_API_WARN_MS}" )
+  MESSAGE( STATUS "     " )
+  SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLOG_LONG_API -DLOG_LONG_API_MAX_MS=${LOG_LONG_API_MAX_MS} -DLOG_LONG_API_WARN_MS=${LOG_LONG_API_WARN_MS}" )
+  SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLOG_LONG_API -DLOG_LONG_API_MAX_MS=${LOG_LONG_API_MAX_MS} -DLOG_LONG_API_WARN_MS=${LOG_LONG_API_WARN_MS}" )
+endif()
+
 target_include_directories(fc
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${Boost_INCLUDE_DIR}
     ${OPENSSL_INCLUDE_DIR}
     "vendor/diff-match-patch-cpp-stl"
+    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp
     "${readline_includes}"
 
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/cyoencode-1.0.2/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/udt4/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
+    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/equihash
   )
 
-#target_link_libraries( fc PUBLIC udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
+#target_link_libraries( fc PUBLIC ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
 IF(NOT WIN32)
   set(LINK_USR_LOCAL_LIB -L/usr/local/lib)
 ENDIF()
-target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
+target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} equihash ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
 
 if(MSVC)
   set_source_files_properties( src/network/http/websocket.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
@@ -342,70 +391,10 @@ add_definitions(-DBOOST_TEST_DYN_LINK)
 ENDIF(MSVC)
 ENDIF()
 
-add_executable( api tests/api.cpp )
-target_link_libraries( api fc )
-
-if( ECC_IMPL STREQUAL secp256k1 )
-    add_executable( blind tests/all_tests.cpp tests/crypto/blind.cpp )
-    target_link_libraries( blind fc )
-endif()
-
 include_directories( vendor/websocketpp )
+include_directories( vendor/equihash )
 
-add_executable( ntp_test tests/all_tests.cpp tests/network/ntp_test.cpp )
-target_link_libraries( ntp_test fc )
-
-add_executable( task_cancel_test tests/all_tests.cpp tests/thread/task_cancel.cpp )
-target_link_libraries( task_cancel_test fc )
-
-
-add_executable( bloom_test tests/all_tests.cpp tests/bloom_test.cpp )
-target_link_libraries( bloom_test fc )
-
-add_executable( real128_test tests/all_tests.cpp tests/real128_test.cpp )
-target_link_libraries( real128_test fc )
-
-add_executable( hmac_test tests/hmac_test.cpp )
-target_link_libraries( hmac_test fc )
-
-add_executable( blinding_test tests/blinding_test.cpp )
-target_link_libraries( blinding_test fc )
-
-
-add_executable( udt_server tests/udts.cpp )
-target_link_libraries( udt_server fc udt )
-
-add_executable( udt_client tests/udtc.cpp )
-target_link_libraries( udt_client fc udt )
-
-add_executable( ecc_test tests/crypto/ecc_test.cpp )
-target_link_libraries( ecc_test fc )
-
-#add_executable( test_aes tests/aes_test.cpp )
-#target_link_libraries( test_aes fc ${rt_library} ${pthread_library} )
-#add_executable( test_sleep tests/sleep.cpp )
-#target_link_libraries( test_sleep fc )
-#add_executable( test_rate_limiting tests/rate_limiting.cpp )
-#target_link_libraries( test_rate_limiting fc )
-
-add_executable( all_tests tests/all_tests.cpp
-                          tests/compress/compress.cpp
-                          tests/crypto/aes_test.cpp
-                          tests/crypto/base_n_tests.cpp
-                          tests/crypto/bigint_test.cpp
-                          tests/crypto/blind.cpp
-                          tests/crypto/blowfish_test.cpp
-                          tests/crypto/dh_test.cpp
-                          tests/crypto/rand_test.cpp
-                          tests/crypto/sha_tests.cpp
-                          tests/network/ntp_test.cpp
-                          tests/network/http/websocket_test.cpp
-                          tests/thread/task_cancel.cpp
-                          tests/bloom_test.cpp
-                          tests/real128_test.cpp
-                          tests/utf8_test.cpp
-                          )
-target_link_libraries( all_tests fc )
+add_subdirectory(tests)
 
 if(WIN32)
    # add addtional import library on windows platform
@@ -489,14 +478,6 @@ if(WIN32)
 
 endif(WIN32)
 
-IF(APPLE)
-  # As of 10.10 yosemite, the OpenSSL static libraries shipped with os x have a dependency
-  # on zlib, so any time you link in openssl you also need to link zlib.  .  We really want to detect whether openssl was configured with the --no-zlib
-  # option or not when it was built, but that's difficult to do in practice, so we
-  # just always try to link it in on mac.
-  find_package( ZLIB REQUIRED )
-ENDIF(APPLE)
-
 SET(OPENSSL_CONF_TARGET )
 IF(DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   SET (OPENSSL_CONF_TARGET ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

CMakeModules/FindReadline.cmake

@@ -45,3 +45,5 @@ mark_as_advanced(
     Readline_INCLUDE_DIR
     Readline_LIBRARY
 )
+
+MESSAGE( STATUS "Found Readline: ${Readline_LIBRARY}" )

include/fc/array.hpp

@@ -20,11 +20,17 @@ namespace fc {
     T&       at( size_t pos )      { assert( pos < N); return data[pos]; }
     const T& at( size_t pos )const { assert( pos < N); return data[pos]; }
     ///@}
+
+    T&       operator[]( size_t pos )      { assert( pos < N); return data[pos]; }
+    const T& operator[]( size_t pos )const { assert( pos < N); return data[pos]; }
+
 
-    T*           begin()       {  return &data[0]; }
     const T*     begin()const  {  return &data[0]; }
     const T*     end()const    {  return &data[N]; }
 
+    T*           begin()       {  return &data[0]; }
+    T*           end()         {  return &data[N]; }
+
     size_t       size()const { return N; }
 
     T data[N];

include/fc/container/flat.hpp

@@ -30,8 +30,8 @@ namespace fc {
              value.insert( std::move(tmp) );
          }
        }
-       template<typename Stream, typename K, typename V>
-       inline void pack( Stream& s, const flat_map<K,V>& value ) {
+       template<typename Stream, typename K, typename... V>
+       inline void pack( Stream& s, const flat_map<K,V...>& value ) {
          pack( s, unsigned_int((uint32_t)value.size()) );
          auto itr = value.begin();
          auto end = value.end();
@@ -40,8 +40,8 @@ namespace fc {
            ++itr;
          }
        }
-       template<typename Stream, typename K, typename V>
-       inline void unpack( Stream& s, flat_map<K,V>& value ) 
+       template<typename Stream, typename K, typename V, typename... A>
+       inline void unpack( Stream& s, flat_map<K,V,A...>& value ) 
        {
          unsigned_int size; unpack( s, size );
          value.clear();
@@ -54,6 +54,35 @@ namespace fc {
              value.insert( std::move(tmp) );
          }
        }
+
+       template<typename Stream, typename T, typename A>
+       void pack( Stream& s, const bip::vector<T,A>& value ) {
+         pack( s, unsigned_int((uint32_t)value.size()) );
+         if( !std::is_fundamental<T>::value ) {
+            auto itr = value.begin();
+            auto end = value.end();
+            while( itr != end ) {
+              fc::raw::pack( s, *itr );
+              ++itr;
+            }
+         } else {
+             s.write( (const char*)value.data(), value.size() );
+         }
+       }
+
+       template<typename Stream, typename T, typename A>
+       void unpack( Stream& s, bip::vector<T,A>& value ) {
+          unsigned_int size;
+          unpack( s, size );
+          value.resize( size );
+          if( !std::is_fundamental<T>::value ) {
+             for( auto& item : value )
+                unpack( s, item );
+          } else {
+             s.read( (char*)value.data(), value.size() );
+          }
+       }
+
    } // namespace raw
 
 
@@ -76,17 +105,17 @@ namespace fc {
          vo.insert( itr->as<T>() );
    }
 
-   template<typename K, typename T>
-   void to_variant( const flat_map<K, T>& var,  variant& vo )
+   template<typename K, typename... T>
+   void to_variant( const flat_map<K, T...>& var,  variant& vo )
    {
        std::vector< variant > vars(var.size());
        size_t i = 0;
        for( auto itr = var.begin(); itr != var.end(); ++itr, ++i )
           vars[i] = fc::variant(*itr);
        vo = vars;
    }
-   template<typename K, typename T>
-   void from_variant( const variant& var,  flat_map<K, T>& vo )
+   template<typename K, typename T, typename... A>
+   void from_variant( const variant& var,  flat_map<K, T, A...>& vo )
    {
       const variants& vars = var.get_array();
       vo.clear();

include/fc/container/flat_fwd.hpp

@@ -1,21 +1,29 @@
 #pragma once 
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
+#include <boost/interprocess/containers/vector.hpp>
 
 namespace fc {
 
    using boost::container::flat_map;
    using boost::container::flat_set;
+   namespace bip = boost::interprocess;
 
    namespace raw {
        template<typename Stream, typename T>
        void pack( Stream& s, const flat_set<T>& value );
        template<typename Stream, typename T>
        void unpack( Stream& s, flat_set<T>& value );
-       template<typename Stream, typename K, typename V>
-       void pack( Stream& s, const flat_map<K,V>& value );
-       template<typename Stream, typename K, typename V>
-       void unpack( Stream& s, flat_map<K,V>& value ) ;
+       template<typename Stream, typename K, typename... V>
+       void pack( Stream& s, const flat_map<K,V...>& value );
+       template<typename Stream, typename K, typename... V>
+       void unpack( Stream& s, flat_map<K,V...>& value ) ;
+
+
+       template<typename Stream, typename T, typename A>
+       void pack( Stream& s, const bip::vector<T,A>& value );
+       template<typename Stream, typename T, typename A>
+       void unpack( Stream& s, bip::vector<T,A>& value );
    } // namespace raw
 
 } // fc