Merge branch 'master' into thomasbcox-missing-rcs

eosio_build.sh

@@ -153,7 +153,7 @@
 				export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm
 				export CMAKE=${HOME}/opt/cmake/bin/cmake
 				export PATH=${HOME}/opt/mongodb/bin:$PATH
-				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
+				export BOOST_ROOT="${HOME}/opt/boost"
 			;;
 			"elementary OS")
 				FILE="${PWD}/scripts/eosio_build_ubuntu.sh"
@@ -161,7 +161,7 @@
 				C_COMPILER=clang-4.0
 				MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
 				export PATH=${HOME}/opt/mongodb/bin:$PATH
-				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
+				export BOOST_ROOT="${HOME}/opt/boost"
 			;;
 			"Fedora")
 				FILE="${PWD}/scripts/eosio_build_fedora.sh"
@@ -177,7 +177,7 @@
 				C_COMPILER=clang-4.0
 				MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
 				export PATH=${HOME}/opt/mongodb/bin:$PATH
-				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
+				export BOOST_ROOT="${HOME}/opt/boost"
 			;;
 			"Ubuntu")
 				FILE="${PWD}/scripts/eosio_build_ubuntu.sh"
@@ -185,7 +185,7 @@
 				C_COMPILER=clang-4.0
 				MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
 				export PATH=${HOME}/opt/mongodb/bin:$PATH
-				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
+				export BOOST_ROOT="${HOME}/opt/boost"
 			;;
 			*)
 				printf "\\n\\tUnsupported Linux Distribution. Exiting now.\\n\\n"

plugins/producer_plugin/producer_plugin.cpp

@@ -412,8 +412,8 @@ void producer_plugin::set_program_options(
          ("pause-on-startup,x", boost::program_options::bool_switch()->notifier([this](bool p){my->_pause_production = p;}), "Start this node in a state where production is paused")
          ("max-transaction-time", bpo::value<int32_t>()->default_value(30),
           "Limits the maximum time (in milliseconds) that is allowed a pushed transaction's code to execute before being considered invalid")
-         ("max-irreversible-block-age", bpo::value<int32_t>()->default_value( 30 * 60 ),
-          "Limits the maximum age (in seconds) of the DPOS Irreversible Block for a chain this node will produce blocks on")
+         ("max-irreversible-block-age", bpo::value<int32_t>()->default_value( -1 ),
+          "Limits the maximum age (in seconds) of the DPOS Irreversible Block for a chain this node will produce blocks on (use negative value to indicate unlimited)")
          ("producer-name,p", boost::program_options::value<vector<string>>()->composing()->multitoken(),
           "ID of producer controlled by this node (e.g. inita; may specify multiple times)")
          ("private-key", boost::program_options::value<vector<string>>()->composing()->multitoken()->default_value({fc::json::to_string(private_key_default)},

scripts/eosio_build_amazon.sh

@@ -214,7 +214,7 @@
 	if [ -d "${HOME}/opt/boost_1_67_0" ]; then
 		if ! mv "${HOME}/opt/boost_1_67_0" "$BOOST_ROOT"
 		then
-			printf "\\n\\tUnable to move directory ${HOME}/opt/boost_1_67_0 to ${BOOST_ROOT}.\\n"
+			printf "\\n\\tUnable to move directory %s/opt/boost_1_67_0 to %s.\\n" "${HOME}" "${BOOST_ROOT}"
 			printf "\\n\\tExiting now.\\n"
 			exit 1
 		fi
@@ -299,7 +299,7 @@
 		fi
 		printf "\\tBoost successfully installed @ %s.\\n" "${BOOST_ROOT}"
 	else
-		printf "\\tBoost 1.67.0 found at %s.\\n" "${BOOST_ROOT}"
+		printf "\\tBoost found at %s.\\n" "${BOOST_ROOT}"
 	fi
 
 	printf "\\n\\tChecking MongoDB installation.\\n"

scripts/eosio_build_centos.sh

@@ -298,6 +298,23 @@
 		printf "\\tCMAKE found @ %s.\\n" "${CMAKE}"
 	fi
 
+	if [ -d "${HOME}/opt/boost_1_67_0" ]; then
+		if ! mv "${HOME}/opt/boost_1_67_0" "${BOOST_ROOT}"
+		then
+			printf "\\n\\tUnable to move directory %s/opt/boost_1_67_0 to %s.\\n" "${HOME}" "${BOOST_ROOT}"
+			printf "\\n\\tExiting now.\\n"
+			exit 1
+		fi
+		if [ -d "$BUILD_DIR" ]; then
+			if ! rm -rf "$BUILD_DIR"
+			then
+			printf "\\tUnable to remove directory %s. Please remove this directory and run this script %s again. 0\\n" "$BUILD_DIR" "${BASH_SOURCE[0]}"
+			printf "\\tExiting now.\\n\\n"
+			exit 1;
+			fi
+		fi
+	fi
+
 	printf "\\n\\tChecking boost library installation.\\n"
 	BVERSION=$( grep "#define BOOST_VERSION" "${BOOST_ROOT}/include/boost/version.hpp" 2>/dev/null \
 	| tail -1 | tr -s ' ' | cut -d\  -f3)
@@ -366,9 +383,9 @@
 			exit 1;
 			fi
 		fi
-		printf "\\tBoost 1.67.0 successfully installed @ %s/opt/boost_1_67_0.\\n\\n" "${HOME}"
+		printf "\\tBoost successfully installed @ %s.\\n" "${BOOST_ROOT}"
 	else
-		printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n\\n" "${HOME}"
+		printf "\\tBoost 1.67.0 found at %s.\\n\\n" "${BOOST_ROOT}"
 	fi
 
 	printf "\\n\\tChecking MongoDB installation.\\n"

scripts/eosio_build_ubuntu.sh

@@ -106,6 +106,23 @@
 		printf "\\n\\tNo required dpkg dependencies to install.\\n"
 	fi
 
+	if [ -d "${HOME}/opt/boost_1_67_0" ]; then
+		if ! mv "${HOME}/opt/boost_1_67_0" "$BOOST_ROOT"
+		then
+			printf "\\n\\tUnable to move directory %s/opt/boost_1_67_0 to %s.\\n" "${HOME}" "${BOOST_ROOT}"
+			printf "\\n\\tExiting now.\\n"
+			exit 1
+		fi
+		if [ -d "$BUILD_DIR" ]; then
+			if ! rm -rf "$BUILD_DIR"
+			then
+			printf "\\tUnable to remove directory %s. Please remove this directory and run this script %s again. 0\\n" "$BUILD_DIR" "${BASH_SOURCE[0]}"
+			printf "\\tExiting now.\\n\\n"
+			exit 1;
+			fi
+		fi
+	fi
+
 	printf "\\n\\tChecking boost library installation.\\n"
 	BVERSION=$( grep BOOST_LIB_VERSION "${BOOST_ROOT}/include/boost/version.hpp" 2>/dev/null \
 	| tail -1 | tr -s ' ' | cut -d\  -f3 | sed 's/[^0-9\._]//gI')
@@ -174,9 +191,9 @@
 			exit 1;
 			fi
 		fi
-		printf "\\tBoost 1.67.0 successfully installed @ %s/opt/boost_1_67_0.\\n" "${HOME}"
+		printf "\\tBoost successfully installed @ %s.\\n" "${BOOST_ROOT}"
 	else
-		printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n\\n" "${HOME}"
+		printf "\\tBoost found at %s.\\n" "${BOOST_ROOT}"
 	fi
 
 	printf "\\n\\tChecking MongoDB installation.\\n"