Merge pull request #526 from bitshares/release

Release candidate

Author: oxarbitrage

Dockerfile

@@ -1,22 +1,64 @@
-# This will build the witness_node in a docker image. Make sure you've already
-# checked out the submodules before building.
+FROM phusion/baseimage:0.9.19
+MAINTAINER The bitshares decentralized organisation
 
-FROM l3iggs/archlinux:latest
-MAINTAINER Nathan Hourt <[email protected]>
+ENV LANG=en_US.UTF-8
+RUN \
+    apt-get update -y && \
+    apt-get install -y \
+      g++ \
+      autoconf \
+      cmake \
+      git \
+      libbz2-dev \
+      libreadline-dev \
+      libboost-all-dev \
+      libcurl4-openssl-dev \
+      libssl-dev \
+      libncurses-dev \
+      doxygen \
+      libcurl4-openssl-dev \
+    && \
+    apt-get update -y && \
+    apt-get install -y fish && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN pacman -Syu --noconfirm gcc make autoconf automake cmake ninja boost libtool git
+ADD . /bitshares-core
+WORKDIR /bitshares-core
 
-ADD . /bitshares-2
-WORKDIR /bitshares-2
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=Release .
-RUN ninja witness_node || ninja -j 1 witness_node
+# Compile
+RUN \
+    git submodule update --init --recursive && \
+    cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        . && \
+    make witness_node && \
+    make install && \
+    #
+    # Obtain version
+    mkdir /etc/bitshares && \
+    git rev-parse --short HEAD > /etc/bitshares/version && \
+    cd / && \
+    rm -rf /bitshares-core
 
-RUN mkdir /data_dir
-ADD docker/default_config.ini /default_config.ini
-ADD docker/launch /launch
-RUN chmod a+x /launch
-VOLUME /data_dir
+# Home directory $HOME
+WORKDIR /
+RUN useradd -s /bin/bash -m -d /var/lib/bitshares bitshares
+ENV HOME /var/lib/bitshares
+RUN chown bitshares:bitshares -R /var/lib/bitshares
 
-EXPOSE 8090 9090
+# Volume
+VOLUME ["/var/lib/bitshares", "/etc/bitshares"]
 
-ENTRYPOINT ["/launch"]
+# rpc service:
+EXPOSE 8090
+# p2p service:
+EXPOSE 2001
+
+# default exec/config files
+ADD docker/default_config.ini /etc/bitshares/config.ini
+ADD docker/bitsharesentry.sh /usr/local/bin/bitsharesentry.sh
+RUN chmod a+x /usr/local/bin/bitsharesentry.sh
+
+# default execute entry
+CMD /usr/local/bin/bitsharesentry.sh

README.md

@@ -30,7 +30,7 @@ Build instructions and additional documentation are available in the
 We recommend building on Ubuntu 16.04 LTS, and the build dependencies may be installed with:
 
     sudo apt-get update
-    sudo apt-get install autoconf cmake git libboost-all-dev libssl-dev g++
+    sudo apt-get install autoconf cmake git libboost-all-dev libssl-dev g++ libcurl4-openssl-dev
 
 To build after all dependencies are installed:
 
@@ -43,8 +43,8 @@ To build after all dependencies are installed:
 
 **NOTE:** BitShares requires an [OpenSSL](https://www.openssl.org/) version in the 1.0.x series. OpenSSL 1.1.0 and newer are NOT supported. If your system OpenSSL version is newer, then you will need to manually provide an older version of OpenSSL and specify it to CMake using `-DOPENSSL_INCLUDE_DIR`, `-DOPENSSL_SSL_LIBRARY`, and `-DOPENSSL_CRYPTO_LIBRARY`.
 
-**NOTE:** BitShares requires a [Boost](http://www.boost.org/) version in the range [1.57, 1.60]. Versions earlier than
-1.57 or newer than 1.60 are NOT supported. If your system Boost version is newer, then you will need to manually build
+**NOTE:** BitShares requires a [Boost](http://www.boost.org/) version in the range [1.57, 1.63]. Versions earlier than
+1.57 or newer than 1.63 are NOT supported. If your system Boost version is newer, then you will need to manually build
 an older version of Boost and specify it to CMake using `DBOOST_ROOT`.
 
 After building, the witness node can be launched with:

docker/bitsharesentry.sh

@@ -0,0 +1,85 @@
+#!/bin/bash
+BITSHARESD="/usr/local/bin/witness_node"
+
+# For blockchain download
+VERSION=`cat /etc/bitshares/version`
+
+## Supported Environmental Variables
+#
+#   * $BITSHARESD_SEED_NODES
+#   * $BITSHARESD_RPC_ENDPOINT
+#   * $BITSHARESD_PLUGINS
+#   * $BITSHARESD_REPLAY
+#   * $BITSHARESD_RESYNC
+#   * $BITSHARESD_P2P_ENDPOINT
+#   * $BITSHARESD_WITNESS_ID
+#   * $BITSHARESD_PRIVATE_KEY
+#   * $BITSHARESD_TRACK_ACCOUNTS
+#   * $BITSHARESD_PARTIAL_OPERATIONS
+#   * $BITSHARESD_MAX_OPS_PER_ACCOUNT
+#   * $BITSHARESD_ES_NODE_URL
+#   * $BITSHARESD_TRUSTED_NODE
+#
+
+ARGS=""
+# Translate environmental variables
+if [[ ! -z "$BITSHARESD_SEED_NODES" ]]; then
+    for NODE in $BITSHARESD_SEED_NODES ; do
+        ARGS+=" --seed-node=$NODE"
+    done
+fi
+if [[ ! -z "$BITSHARESD_RPC_ENDPOINT" ]]; then
+    ARGS+=" --rpc-endpoint=${BITSHARESD_RPC_ENDPOINT}"
+fi
+
+if [[ ! -z "$BITSHARESD_PLUGINS" ]]; then
+    ARGS+=" --plugins=\"${BITSHARESD_PLUGINS}\""
+fi
+
+if [[ ! -z "$BITSHARESD_REPLAY" ]]; then
+    ARGS+=" --replay-blockchain"
+fi
+
+if [[ ! -z "$BITSHARESD_RESYNC" ]]; then
+    ARGS+=" --resync-blockchain"
+fi
+
+if [[ ! -z "$BITSHARESD_P2P_ENDPOINT" ]]; then
+    ARGS+=" --p2p-endpoint=${BITSHARESD_P2P_ENDPOINT}"
+fi
+
+if [[ ! -z "$BITSHARESD_WITNESS_ID" ]]; then
+    ARGS+=" --witness-id=$BITSHARESD_WITNESS_ID"
+fi
+
+if [[ ! -z "$BITSHARESD_PRIVATE_KEY" ]]; then
+    ARGS+=" --private-key=$BITSHARESD_PRIVATE_KEY"
+fi
+
+if [[ ! -z "$BITSHARESD_TRACK_ACCOUNTS" ]]; then
+    for ACCOUNT in $BITSHARESD_TRACK_ACCOUNTS ; do
+        ARGS+=" --track-account=$ACCOUNT"
+    done
+fi
+
+if [[ ! -z "$BITSHARESD_PARTIAL_OPERATIONS" ]]; then
+    ARGS+=" --partial-operations=${BITSHARESD_PARTIAL_OPERATIONS}"
+fi
+
+if [[ ! -z "$BITSHARESD_MAX_OPS_PER_ACCOUNT" ]]; then
+    ARGS+=" --max-ops-per-account=${BITSHARESD_MAX_OPS_PER_ACCOUNT}"
+fi
+
+if [[ ! -z "$BITSHARESD_ES_NODE_URL" ]]; then
+    ARGS+=" --elasticsearch-node-url=${BITSHARESD_ES_NODE_URL}"
+fi
+
+if [[ ! -z "$BITSHARESD_TRUSTED_NODE" ]]; then
+    ARGS+=" --trusted-node=${BITSHARESD_TRUSTED_NODE}"
+fi
+
+## Link the bitshares config file into home
+## This link has been created in Dockerfile, already
+ln -f -s /etc/bitshares/config.ini /var/lib/bitshares
+
+$BITSHARESD --data-dir ${HOME} ${ARGS} ${BITSHARESD_ARGS}

docker/default_config.ini

@@ -47,28 +47,16 @@ required-participation = false
 # track-account = 
 
 # Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
-bucket-size = [15,60,300,3600,86400]
+# bucket-size = [15,60,300,3600,86400]
+bucket-size = [60,300,900,1800,3600,14400,86400]
+# for 1 min, 5 mins, 30 mins, 1h, 4 hs and 1 day. i think this should be the default.
+# https://github.com/bitshares/bitshares-core/issues/465
 
 # How far back in time to track history for each bucket size, measured in the number of buckets (default: 1000)
 history-per-size = 1000
 
-# declare an appender named "stderr" that writes messages to the console
-[log.console_appender.stderr]
-stream=std_error
-
-# declare an appender named "p2p" that writes messages to p2p.log
-[log.file_appender.p2p]
-filename=logs/p2p/p2p.log
-# filename can be absolute or relative to this config file
-
-# route any messages logged to the default logger to the "stderr" logger we
-# declared above, if they are info level are higher
-[logger.default]
-level=info
-appenders=stderr
-
-# route messages sent to the "p2p" logger to the p2p appender declared above
-[logger.p2p]
-level=info
-appenders=p2p
+# Max amount of operations to store in the database, per account (drastically reduces RAM requirements)
+max-ops-per-account = 1000
 
+# Remove old operation history # objects from RAM
+partial-operations = true

docker/launch

@@ -58,6 +58,8 @@
 
 #include <boost/range/adaptor/reversed.hpp>
 
+#include <graphene/utilities/git_revision.hpp>
+
 namespace graphene { namespace app {
 using net::item_hash_t;
 using net::item_id;
@@ -943,6 +945,7 @@ void application::set_program_options(boost::program_options::options_descriptio
          ("resync-blockchain", "Delete all blocks and re-sync with network from scratch")
          ("force-validate", "Force validation of all transactions")
          ("genesis-timestamp", bpo::value<uint32_t>(), "Replace timestamp from genesis.json with current time plus this many seconds (experts only!)")
+         ("version,v", "Display version information")
          ;
    command_line_options.add(_cli_options);
    configuration_file_options.add(_cfg_options);
@@ -953,6 +956,14 @@ void application::initialize(const fc::path& data_dir, const boost::program_opti
    my->_data_dir = data_dir;
    my->_options = &options;
 
+   if( options.count("version") )
+   {
+      std::cout << "Version: " << graphene::utilities::git_revision_description << "\n";
+      std::cout << "SHA: " << graphene::utilities::git_revision_sha << "\n";
+      std::cout << "Timestamp: " << fc::get_approximate_relative_time_string(fc::time_point_sec(graphene::utilities::git_revision_unix_timestamp)) << "\n";
+      std::exit(EXIT_SUCCESS);
+   }
+
    if( options.count("create-genesis-json") )
    {
       fc::path genesis_out = options.at("create-genesis-json").as<boost::filesystem::path>();
@@ -989,8 +1000,18 @@ void application::initialize(const fc::path& data_dir, const boost::program_opti
       wanted.push_back("account_history");
       wanted.push_back("market_history");
    }
+   int es_ah_conflict_counter = 0;
    for (auto& it : wanted)
    {
+      if(it == "account_history")
+         ++es_ah_conflict_counter;
+      if(it == "elasticsearch")
+         ++es_ah_conflict_counter;
+
+      if(es_ah_conflict_counter > 1) {
+         elog("Can't start program with elasticsearch and account_history plugin at the same time");
+         std::exit(EXIT_FAILURE);
+      }
       if (!it.empty()) enable_plugin(it);
    }
 }