Merge pull request #2843 from steemit/merge-develop

Merge develop

Dockerfile

@@ -22,6 +22,7 @@ RUN \
         gdb \
         git \
         libboost-all-dev \
+        libyajl-dev \
         libreadline-dev \
         libssl-dev \
         libtool \
@@ -125,7 +126,7 @@ RUN \
     ./tests/chain_test && \
     ./tests/plugin_test && \
     mkdir -p /var/cobertura && \
-    gcovr --object-directory="../" --root=../ --xml-pretty --gcov-exclude=".*tests.*" --gcov-exclude=".*fc.*" --gcov-exclude=".*app*" --gcov-exclude=".*net*" --gcov-exclude=".*plugins*" --gcov-exclude=".*schema*" --gcov-exclude=".*time*" --gcov-exclude=".*utilities*" --gcov-exclude=".*wallet*" --gcov-exclude=".*programs*" --output="/var/cobertura/coverage.xml" && \
+    gcovr --object-directory="../" --root=../ --xml-pretty --gcov-exclude=".*tests.*" --gcov-exclude=".*fc.*" --gcov-exclude=".*app*" --gcov-exclude=".*net*" --gcov-exclude=".*plugins*" --gcov-exclude=".*schema*" --gcov-exclude=".*time*" --gcov-exclude=".*utilities*" --gcov-exclude=".*wallet*" --gcov-exclude=".*programs*" --gcov-exclude=".*vendor*" --output="/var/cobertura/coverage.xml" && \
     cd /usr/local/src/steem && \
     rm -rf /usr/local/src/steem/build ; \
     fi
@@ -248,8 +249,6 @@ ADD contrib/fullnode.config.ini /etc/steemd/fullnode.config.ini
 ADD contrib/fullnode.opswhitelist.config.ini /etc/steemd/fullnode.opswhitelist.config.ini
 ADD contrib/config-for-broadcaster.ini /etc/steemd/config-for-broadcaster.ini
 ADD contrib/config-for-ahnode.ini /etc/steemd/config-for-ahnode.ini
-ADD contrib/testnet.config.ini /etc/steemd/testnet.config.ini
-ADD contrib/fastgen.config.ini /etc/steemd/fastgen.config.ini
 
 # add normal startup script that starts via sv
 ADD contrib/steemd.run /usr/local/bin/steem-sv-run.sh
@@ -261,12 +260,12 @@ ADD contrib/healthcheck.conf.template /etc/nginx/healthcheck.conf.template
 
 # add PaaS startup script and service script
 ADD contrib/startpaassteemd.sh /usr/local/bin/startpaassteemd.sh
-ADD contrib/testnetinit.sh /usr/local/bin/testnetinit.sh
+ADD contrib/pulltestnetscripts.sh /usr/local/bin/pulltestnetscripts.sh
 ADD contrib/paas-sv-run.sh /usr/local/bin/paas-sv-run.sh
 ADD contrib/sync-sv-run.sh /usr/local/bin/sync-sv-run.sh
 ADD contrib/healthcheck.sh /usr/local/bin/healthcheck.sh
 RUN chmod +x /usr/local/bin/startpaassteemd.sh
-RUN chmod +x /usr/local/bin/testnetinit.sh
+RUN chmod +x /usr/local/bin/pulltestnetscripts.sh
 RUN chmod +x /usr/local/bin/paas-sv-run.sh
 RUN chmod +x /usr/local/bin/sync-sv-run.sh
 RUN chmod +x /usr/local/bin/healthcheck.sh

ciscripts/buildscript.sh

@@ -8,4 +8,4 @@ sudo docker build --build-arg BUILD_STEP=2 -t=$IMAGE_NAME .
 sudo docker login --username=$DOCKER_USER --password=$DOCKER_PASS
 sudo docker push $IMAGE_NAME
 # make docker cleanup after itself and delete all exited containers
-sudo docker rm -v $(docker ps -a -q -f status=exited) || true
+sudo docker rm -v $(docker ps -a -q -f status=exited) || true

contrib/pulltestnetscripts.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo steemd-testnet: getting deployment scripts from external source
+
+wget -qO- $SCRIPTURL/master/$LAUNCHENV/$APP/testnetinit.sh > /usr/local/bin/testnetinit.sh
+wget -qO- $SCRIPTURL/master/$LAUNCHENV/$APP/testnet.config.ini > /etc/steemd/testnet.config.ini
+wget -qO- $SCRIPTURL/master/$LAUNCHENV/$APP/fastgen.config.ini > /etc/steemd/fastgen.config.ini
+chmod +x /usr/local/bin/testnetinit.sh
+
+echo steemd-testnet: launching testnetinit script
+
+/usr/local/bin/testnetinit.sh

contrib/steemdentrypoint.sh

@@ -10,7 +10,7 @@ if [[ ! "$USE_PAAS" ]]; then
   chmod +x /etc/service/steemd/run
   runsv /etc/service/steemd
 elif [[ "$IS_TESTNET" ]]; then
-  /usr/local/bin/testnetinit.sh
+  /usr/local/bin/pulltestnetscripts.sh
 else
   /usr/local/bin/startpaassteemd.sh
 fi

libraries/chain/CMakeLists.txt

@@ -19,6 +19,7 @@ add_library( steem_chain
 
              generic_custom_operation_interpreter.cpp
 
+             util/rd.cpp
              util/reward.cpp
              util/impacted.cpp
              util/advanced_benchmark_dumper.cpp