Merge pull request #765 from steemit/v0.16.1

V0.16.1

CMakeLists.txt

@@ -175,6 +175,8 @@ else( WIN32 ) # Apple AND Linux
         endif()
     endif()
 
+    set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+
     # based on http://www.delorie.com/gnu/docs/gdb/gdb_70.html
     # uncomment this line to tell GDB about macros (slows compile times)
     # set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gdwarf-2 -g3" )

Dockerfile

@@ -2,6 +2,8 @@ FROM phusion/baseimage:0.9.19
 
 #ARG STEEMD_BLOCKCHAIN=https://example.com/steemd-blockchain.tbz2
 
+ENV LANG=en_US.UTF-8
+
 RUN \
     apt-get update && \
     apt-get install -y \
@@ -19,14 +21,54 @@ RUN \
         libtool \
         ncurses-dev \
         pbzip2 \
+        pkg-config \
         python3 \
         python3-dev \
+        python3-pip \
     && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    pip3 install gcovr
 
 ADD . /usr/local/src/steem
 
+RUN \
+    cd /usr/local/src/steem && \
+    git submodule update --init --recursive && \
+    mkdir build && \
+    cd build && \
+    cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DBUILD_STEEM_TESTNET=ON \
+        -DLOW_MEMORY_NODE=OFF \
+        -DCLEAR_VOTES=ON \
+        .. && \
+    make -j$(nproc) chain_test && \
+    ./tests/chain_test && \
+    cd /usr/local/src/steem && \
+    doxygen && \
+    programs/build_helpers/check_reflect.py && \
+    rm -rf /usr/local/src/steem/build
+
+RUN \
+    cd /usr/local/src/steem && \
+    git submodule update --init --recursive && \
+    mkdir build && \
+    cd build && \
+    cmake \
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DENABLE_COVERAGE_TESTING=ON \
+        -DBUILD_STEEM_TESTNET=ON \
+        -DLOW_MEMORY_NODE=OFF \
+        -DCLEAR_VOTES=ON \
+        .. && \
+    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/steem && \
+    rm -rf /usr/local/src/steem/build
+
 RUN \
     cd /usr/local/src/steem && \
     git submodule update --init --recursive && \

ciscripts/buildfailure.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+curl -XPOST -H "Authorization: token $GITHUB_SECRET" https://api.github.com/repos/steemit/steem/statuses/$(git rev-parse HEAD) -d "{
+  \"state\": \"failure\",
+  \"target_url\": \"${BUILD_URL}\",
+  \"description\": \"JenkinsCI reports the build has failed!\",
+  \"context\": \"jenkins-ci-steemit\"
+}"
+rm -rf $WORKSPACE/*
+# make docker cleanup after itself and delete all exited containers
+sudo docker rm -v $(docker ps -a -q -f status=exited) || true

ciscripts/buildpending.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+curl -XPOST -H "Authorization: token $GITHUB_SECRET" https://api.github.com/repos/steemit/steem/statuses/$(git rev-parse HEAD) -d "{
+  \"state\": \"pending\",
+  \"target_url\": \"${BUILD_URL}\",
+  \"description\": \"The build is now pending in jenkinsci!\",
+  \"context\": \"jenkins-ci-steemit\"
+}"

ciscripts/buildscript.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+export IMAGE_NAME="steemit/steem:${GIT_BRANCH#*/}"
+if [[ $IMAGE_NAME == "steemit/steem:stable" ]] ; then
+  IMAGE_NAME="steemit/steem:latest"
+fi
+sudo docker build -t=$IMAGE_NAME .
+sudo docker login --username=$DOCKER_USER --password=$DOCKER_PASS
+sudo docker push $IMAGE_NAME
+sudo docker run -v /var/jenkins_home:/var/jenkins $IMAGE_NAME cp -r /var/cobertura /var/jenkins
+cp -r /var/jenkins_home/cobertura .

ciscripts/buildsuccess.sh

@@ -0,0 +1,11 @@
+#/bin/bash
+#testcommit
+curl -XPOST -H "Authorization: token $GITHUB_SECRET" https://api.github.com/repos/steemit/steem/statuses/$(git rev-parse HEAD) -d "{
+  \"state\": \"success\",
+  \"target_url\": \"${BUILD_URL}\",
+  \"description\": \"Jenkins-CI reports build succeeded!!\",
+  \"context\": \"jenkins-ci-steemit\"
+}"
+rm -rf $WORKSPACE/*
+# make docker cleanup after itself and delete all exited containers
+sudo docker rm -v $(docker ps -a -q -f status=exited) || true

ciscripts/triggerbuild.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+sh $WORKSPACE/ciscripts/buildpending.sh
+if sh $WORKSPACE/ciscripts/buildscript.sh; then
+  echo BUILD SUCCESS
+else
+  echo BUILD FAILURE
+  exit 1
+fi

doc/building.md

@@ -44,7 +44,8 @@ will build out of the box without further effort:
         git \
         libssl-dev \
         libtool \
-        make
+        make \
+        pkg-config
 
     # Boost packages (also required)
     sudo apt-get install -y \
@@ -92,7 +93,8 @@ Here are the required packages:
         git \
         libssl-dev \
         libtool \
-        make
+        make \
+        pkg-config
 
     # Packages required to build Boost
     sudo apt-get install -y \

doc/seednodes.txt

@@ -7,7 +7,7 @@ steemd.pharesim.me:2001        # pharesim
 seed.jesta.us:2001             # jesta
 212.117.213.186:2016           # liondani
 anyx.co:2001                   # anyx
-45.55.217.111:12150            # xeldal
+seed.xeldal.com:12150          # xeldal
 seed.steemnodes.com:2001       # wackou
 steem.clawmap.com:2001         # steempty
 gtg.steem.house:2001           # gtg
@@ -26,6 +26,7 @@ steem.global:2001              # klye
 seed.royaltiffany.me:2001      # royaltiffany
 129.232.223.74:2001            # thecryptodrive
 steem-id.altexplorer.xyz:2001  # steem-id
+seed.bitcoiner.me:2001         # bitcoiner
 52.26.78.244:2001              # ?
 52.37.169.52:2001              # ?
 52.38.66.234:2001              # ?

libraries/app/application.cpp

@@ -333,7 +333,7 @@ namespace detail {
                }
                catch( fc::exception& e )
                {
-                  wlog( "Error conencting to remote RPC, network api forwarding disabled.", ("e", e.to_detail_string()) );
+                  wlog( "Error connecting to remote RPC, network api forwarding disabled.  ${e}", ("e", e.to_detail_string()) );
                }
             }
          }
@@ -523,9 +523,9 @@ namespace detail {
 
       bool is_included_block(const block_id_type& block_id)
       {
-        uint32_t block_num = block_header::num_from_id(block_id);
-        block_id_type block_id_in_preferred_chain = _chain_db->get_block_id_for_num(block_num);
-        return block_id == block_id_in_preferred_chain;
+         uint32_t block_num = block_header::num_from_id(block_id);
+         block_id_type block_id_in_preferred_chain = _chain_db->get_block_id_for_num(block_num);
+         return block_id == block_id_in_preferred_chain;
       }
 
       /**