Merge branch 'golos-v0.16.5'

.gitmodules

@@ -1,6 +1,10 @@
-[submodule "libraries/fc"]
-	path = libraries/fc
+[submodule "thirdparty/fc"]
+	path = thirdparty/fc
 	url = https://github.com/GolosChain/fc.git
-[submodule "libraries/chainbase"]
-	path = libraries/chainbase
+	branch = 16.5
+[submodule "thirdparty/chainbase"]
+	path = thirdparty/chainbase
 	url = https://github.com/GolosChain/chainbase.git
+[submodule "thirdparty/appbase"]
+	path = thirdparty/appbase
+	url = https://github.com/GolosChain/appbase.git

.travis.yml

@@ -5,22 +5,7 @@ language: cpp
 services:
   - docker
 
-
-addons:
-  ssh_known_hosts: developers.golos.io
-  apt:
-    packages:
-      - doxygen
-      - doxygen-doc
-      - doxygen-latex
-      - doxygen-gui
-      - graphviz
-
 before_install:
-  - sudo apt-get install python-software-properties 
-  - sudo apt-add-repository -y ppa:libreoffice/libreoffice-4-2
-  - sudo apt-get update
-  - sudo apt-get install -y doxygen 
   - echo "$TRAVIS_TAG"
   - echo "$TRAVIS_BRANCH"
 
@@ -42,4 +27,3 @@ after_success:
       docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
       docker push goloschain/golos:"$TRAVIS_TAG";
     fi
-

CMakeLists.txt

@@ -30,8 +30,8 @@ if(USE_PCH)
     include(cotire)
 endif(USE_PCH)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules")
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/GitVersionGen")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/fc/CMakeModules")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/fc/GitVersionGen")
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA2)
 
@@ -46,7 +46,8 @@ list(APPEND BOOST_COMPONENTS thread
         chrono
         unit_test_framework
         context
-        locale)
+        locale
+)
 
 option(Boost_USE_STATIC_LIBS "Build with Boost static libraries usage" TRUE)
 
@@ -101,6 +102,12 @@ if(NOT "${Boost_VERSION}" MATCHES "1.53(.*)")
     set(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES})
 endif()
 
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif(CCACHE_FOUND)
+
 if(WIN32)
 
     message(STATUS "Configuring Golos on WIN32")
@@ -158,11 +165,11 @@ else(WIN32) # Apple AND Linux
     if(APPLE)
         # Apple Specific Options Here
         message(STATUS "Configuring Golos on OS X")
-        set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -stdlib=libc++ -Wall -Wno-conversion -Wno-deprecated-declarations")
+        set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++14 -stdlib=libc++ -Wall -Wno-conversion -Wno-deprecated-declarations")
     else(APPLE)
         # Linux Specific Options Here
         message(STATUS "Configuring Golos on Linux")
-        set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -Wall")
+        set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++14 -Wall")
         set(rt_library rt)
         set(pthread_library pthread)
         if(NOT DEFINED crypto_library)
@@ -199,11 +206,17 @@ if(ENABLE_COVERAGE_TESTING)
     set(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
 endif()
 
+set(ENABLE_TESTING FALSE CACHE BOOL "Run unit tests for Golos")
+
+if (ENABLE_TESTING)
+  enable_testing()
+endif()
+
 # external_plugins needs to be compiled first because libraries/app depends on GOLOSIT_EXTERNAL_PLUGINS being fully populated
-add_subdirectory(external_plugins)
+add_subdirectory(thirdparty)
 add_subdirectory(libraries)
+add_subdirectory(plugins)
 add_subdirectory(programs)
-
 add_subdirectory(tests)
 
 if(ENABLE_INSTALLER)

Dockerfile

@@ -15,6 +15,7 @@ RUN \
         cmake \
         doxygen \
         git \
+        ccache\
         libboost-all-dev \
         libreadline-dev \
         libssl-dev \
@@ -32,43 +33,6 @@ RUN \
 
 ADD . /usr/local/src/golos
 
-#RUN \
-#    cd /usr/local/src/golos && \
-#    git submodule update --init --recursive && \
-#    mkdir build && \
-#    cd build && \
-#    cmake \
-#        -DCMAKE_BUILD_TYPE=Release \
-#        -DBUILD_GOLOS_TESTNET=TRUE \
-#        -DLOW_MEMORY_NODE=FALSE \
-#        -DCLEAR_VOTES=TRUE \
-#        .. && \
-#    make -j$(nproc) chain_test && \
-#    ./tests/chain_test && \
-#    cd /usr/local/src/golos && \
-#    doxygen && \
-#    programs/build_helpers/check_reflect.py && \
-#    rm -rf /usr/local/src/golos/build
-
-#RUN \
-#    cd /usr/local/src/golos && \
-#    git submodule update --init --recursive && \
-#    mkdir build && \
-#    cd build && \
-#    cmake \
-#        -DCMAKE_BUILD_TYPE=Debug \
-#        -DENABLE_COVERAGE_TESTING=TRUE \
-#        -DBUILD_GOLOS_TESTNET=TRUE \
-#        -DLOW_MEMORY_NODE=FALSE \
-#        -DCLEAR_VOTES=TRUE \
-#        .. && \
-#    make -j$(nproc) chain_test && \
-#    ./tests/chain_test && \
-#    mkdir -p /var/cobertura && \
-#    gcovr --object-directory="../" --root=../ --xml-pretty --gcov-exclude=".*tests.*" --gcov-exclude=".*fc.*"  --output="/var/cobertura/coverage.xml" && \
-#    cd /usr/local/src/golos && \
-#    rm -rf /usr/local/src/golos/build
-
 RUN \
     cd /usr/local/src/golos && \
     git submodule update --init --recursive && \
@@ -146,19 +110,22 @@ RUN mkdir /var/cache/golosd && \
 ENV HOME /var/lib/golosd
 RUN chown golosd:golosd -R /var/lib/golosd
 
-ADD programs/golosd/snapshot5392323.json /var/lib/golosd
+ADD share/golosd/snapshot5392323.json /var/lib/golosd
 
 # rpc service:
+# http
 EXPOSE 8090
+# ws
+EXPOSE 8091
 # p2p service:
 EXPOSE 2001
 
 RUN mkdir -p /etc/service/golosd
-ADD contribution/golosd.sh /etc/service/golosd/run
+ADD share/golosd/golosd.sh /etc/service/golosd/run
 RUN chmod +x /etc/service/golosd/run
 
 # add seednodes from documentation to image
-ADD documentation/seednodes /etc/golosd/seednodes
+ADD share/golosd/seednodes /etc/golosd/seednodes
 
 # the following adds lots of logging info to stdout
-ADD contribution/config.ini /etc/golosd/config.ini
+ADD share/golosd/config/config.ini /etc/golosd/config.ini

libraries/CMakeLists.txt

@@ -1,12 +1,6 @@
-add_subdirectory(fc)
-add_subdirectory(schema)
-add_subdirectory(chainbase)
 add_subdirectory(chain)
 add_subdirectory(protocol)
-add_subdirectory(net)
+add_subdirectory(network)
 add_subdirectory(time)
 add_subdirectory(utilities)
-add_subdirectory(app)
-add_subdirectory(plugins)
 add_subdirectory(wallet)
-add_subdirectory(manifest)