fc changes to support ubuntu-18.04 upgrade

CMakeLists.txt

@@ -40,7 +40,7 @@ endif()
 SET (ORIGINAL_LIB_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
 
 SET(BOOST_COMPONENTS)
-LIST(APPEND BOOST_COMPONENTS thread date_time system filesystem program_options signals serialization chrono unit_test_framework context locale iostreams)
+LIST(APPEND BOOST_COMPONENTS thread date_time filesystem system program_options signals serialization chrono unit_test_framework context locale iostreams)
 SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 
 IF( ECC_IMPL STREQUAL openssl )
@@ -190,7 +190,6 @@ set( fc_sources
      src/io/varint.cpp
      src/io/console.cpp
      src/filesystem.cpp
-     src/interprocess/process.cpp
      src/interprocess/signals.cpp
      src/interprocess/file_mapping.cpp
      src/interprocess/mmap_struct.cpp
@@ -336,15 +335,6 @@ else()
   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")
 
@@ -373,7 +363,6 @@ target_include_directories(fc
     "${readline_includes}"
 
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
   )
 
@@ -381,7 +370,7 @@ target_include_directories(fc
 IF(NOT WIN32)
   set(LINK_USR_LOCAL_LIB -L/usr/local/lib)
 ENDIF()
-target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
+target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_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" )

CMakeModules/FindReadline.cmake

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

include/fc/crypto/elliptic.hpp

@@ -25,9 +25,7 @@ namespace fc {
     typedef fc::array<unsigned char,65> compact_signature;
     typedef std::vector<char>           range_proof_type;
     typedef fc::array<char,78>          extended_key_data;
-    typedef fc::sha256                  blinded_hash;
-    typedef fc::sha256                  blind_signature;
-
+ 
     /**
      *  @class public_key
      *  @brief contains only the public point of an elliptic curve key.
@@ -38,7 +36,6 @@ namespace fc {
            public_key();
            public_key(const public_key& k);
            ~public_key();
-//           bool verify( const fc::sha256& digest, const signature& sig );
            public_key_data serialize()const;
            public_key_point_data serialize_ecc_point()const;
 
@@ -52,8 +49,6 @@ namespace fc {
            public_key child( const fc::sha256& offset )const;
 
            bool valid()const;
-           /** Computes new pubkey = generator * offset + old pubkey ?! */
-//           public_key mult( const fc::sha256& offset )const;
            /** Computes new pubkey = regenerate(offset).pubkey + old pubkey
             *                      = offset * G + 1 * old pubkey ?! */
            public_key add( const fc::sha256& offset )const;
@@ -164,8 +159,6 @@ namespace fc {
             fc::string to_base58() const { return str(); }
             static extended_public_key from_base58( const fc::string& base58 );
 
-            public_key generate_p( int i ) const;
-            public_key generate_q( int i ) const;
         private:
             sha256 c;
             int child_num, parent_fp;
@@ -192,25 +185,10 @@ namespace fc {
             static extended_private_key generate_master( const fc::string& seed );
             static extended_private_key generate_master( const char* seed, uint32_t seed_len );
 
-            // Oleg Andreev's blind signature scheme,
-            // see http://blog.oleganza.com/post/77474860538/blind-signatures
-            public_key blind_public_key( const extended_public_key& bob, int i ) const;
-            blinded_hash blind_hash( const fc::sha256& hash, int i ) const;
-            blind_signature blind_sign( const blinded_hash& hash, int i ) const;
-            // WARNING! This may produce non-canonical signatures!
-            compact_signature unblind_signature( const extended_public_key& bob,
-                                                 const blind_signature& sig,
-                                                 const fc::sha256& hash, int i ) const;
-
         private:
             extended_private_key private_derive_rest( const fc::sha512& hash,
                                                       int num ) const;
-            private_key generate_a( int i ) const;
-            private_key generate_b( int i ) const;
-            private_key generate_c( int i ) const;
-            private_key generate_d( int i ) const;
-            private_key_secret compute_p( int i ) const;
-            private_key_secret compute_q( int i, const private_key_secret& p ) const;
+
             sha256 c;
             int child_num, parent_fp;
             uint8_t depth;

include/fc/crypto/sha256.hpp

@@ -119,16 +119,6 @@ namespace std
     };
 }
 
-namespace boost
-{
-    template<>
-    struct hash<fc::sha256>
-    {
-       size_t operator()( const fc::sha256& s )const
-       {
-           return  s._hash[3];//*((size_t*)&s);
-       }
-    };
-}
+
 #include <fc/reflect/reflect.hpp>
 FC_REFLECT_TYPENAME( fc::sha256 )