Voting updates for mainnet, added height activation for old updates, …

…improved Updates logging, removed raptoreum-tx.

.gitignore

@@ -10,7 +10,6 @@ reset-files.bash
 src/raptoreum
 src/raptoreumd
 src/raptoreum-cli
-src/raptoreum-tx
 src/raptoreum-wallet
 src/test/fuzz
 !src/test/fuzz/*.*
@@ -138,7 +137,6 @@ raptoreum-cli
 raptoreumd
 raptoreum-qt
 raptoreum-wallet
-raptoreum-tx
 make
 
 /docker/bin

Makefile.am

@@ -26,7 +26,6 @@ endif
 BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
 BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
 BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
-BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT)
 BITCOIN_WALLET_BIN=$(top_builddir)/src/$(BITCOIN_WALLET_TOOL_NAME)$(EXEEXT)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win64-setup$(EXEEXT)
 
@@ -42,7 +41,6 @@ OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
 
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
 DIST_CONTRIB = $(top_srcdir)/contrib/raptoreum-cli.bash-completion \
-	       $(top_srcdir)/contrib/raptoreum-tx.bash-completion \
 	       $(top_srcdir)/contrib/raptoreumd.bash-completion \
 	       $(top_srcdir)/contrib/init
 DIST_SHARE = \
@@ -74,7 +72,6 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TX_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_WALLET_BIN) $(top_builddir)/release
 	@test -f $(MAKENSIS) && echo 'OutFile "$@"' | cat $(top_builddir)/share/setup.nsi - | $(MAKENSIS) -V2 - || \
 	  echo error: could not build $@
@@ -144,9 +141,6 @@ $(BITCOIND_BIN): FORCE
 $(BITCOIN_CLI_BIN): FORCE
 	$(MAKE) -C src $(@F)
 
-$(BITCOIN_TX_BIN): FORCE
-	$(MAKE) -C src $(@F)
-
 $(BITCOIN_WALLET_BIN): FORCE
 	$(MAKE) -C src $(@F)
 

configure.ac

@@ -22,7 +22,6 @@ fi
 BITCOIN_DAEMON_NAME=raptoreumd
 BITCOIN_GUI_NAME=raptoreum-qt
 BITCOIN_CLI_NAME=raptoreum-cli
-BITCOIN_TX_NAME=raptoreum-tx
 BITCOIN_WALLET_TOOL_NAME=raptoreum-wallet
 
 dnl Unless the user specified ARFLAGS, force it to be cr
@@ -589,7 +588,7 @@ CORE_CPPFLAGS="$CORE_CPPFLAGS -DHAVE_BUILD_INFO"
 
 AC_ARG_WITH([utils],
   [AS_HELP_STRING([--with-utils],
-  [build raptoreum-cli raptoreum-tx raptoreum-wallet (default=yes)])],
+  [build raptoreum-cli raptoreum-wallet (default=yes)])],
   [build_bitcoin_utils=$withval],
   [build_bitcoin_utils=yes])
 
@@ -599,11 +598,6 @@ AC_ARG_ENABLE([util-cli],
   [build_bitcoin_cli=$enableval],
   [build_bitcoin_cli=$build_bitcoin_utils])
 
-AC_ARG_ENABLE([util-tx],
-  [AS_HELP_STRING([--enable-util-tx],
-  [build raptoreum-tx (default=no)])],
-  [build_bitcoin_tx=$enableval])
-
 AC_ARG_ENABLE([util-wallet],
   [AS_HELP_STRING([--enable-util-wallet],
   [build raptoreum-wallet])],
@@ -1241,7 +1235,6 @@ if test "$enable_fuzz" = "yes"; then
   AC_MSG_WARN([enable-fuzz will disable all other targets and force --enable-fuzz-binary=yes])
   build_bitcoin_utils=no
   build_bitcoin_cli=no
-  build_bitcoin_tx=no
   build_bitcoin_wallet=no
   build_bitcoind=no
   build_bitcoin_libs=no
@@ -1307,7 +1300,7 @@ if test "$enable_wallet" != "no"; then
   fi
 fi
 
-if test "$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nononononono"; then
+if test "$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nononononono"; then
   use_upno=no
   use_natpmp=no
   use_zmq=no
@@ -1355,7 +1348,7 @@ if test "$use_natpmp" != "no"; then
   CPPFLAGS="$TEMP_CPPFLAGS"
 fi
 
-if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench" = "nonononononono"; then
+if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench" = "nonononononono"; then
     use_boost=no
 else
     use_boost=yes
@@ -1491,10 +1484,6 @@ AC_MSG_CHECKING([whether to build raptoreum-cli])
 AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test $build_bitcoin_cli = "yes"])
 AC_MSG_RESULT([$build_bitcoin_cli])
 
-AC_MSG_CHECKING([whether to build raptoreum-tx])
-AM_CONDITIONAL([BUILD_BITCOIN_TX], [test $build_bitcoin_tx = "yes"])
-AC_MSG_RESULT([$build_bitcoin_tx])
-
 AC_MSG_CHECKING([whether to build raptoreum-wallet])
 AM_CONDITIONAL([BUILD_BITCOIN_WALLET], [test $build_bitcoin_wallet = "yes"])
 AC_MSG_RESULT($build_bitcoin_wallet)
@@ -1664,7 +1653,7 @@ else
 fi
 AC_MSG_RESULT([$dsymutil_needs_flat])
 
-if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nononononononono"; then
+if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nononononononono"; then
   AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-bench or --enable-tests])
 fi
 
@@ -1719,7 +1708,6 @@ AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL")
 AC_SUBST(BITCOIN_DAEMON_NAME)
 AC_SUBST(BITCOIN_GUI_NAME)
 AC_SUBST(BITCOIN_CLI_NAME)
-AC_SUBST(BITCOIN_TX_NAME)
 AC_SUBST(BITCOIN_WALLET_TOOL_NAME)
 
 AC_SUBST(RELDFLAGS)

contrib/debian/control

@@ -50,17 +50,3 @@ Description: peer-to-peer network based digital currency - Qt GUI
  is the name of the open source software which enables the use of this currency.
  .
  This package provides Raptoreum-Qt, a GUI for Raptoreum based on Qt.
-
-Package: raptoreum-tx
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: peer-to-peer digital currency - standalone transaction tool
- Raptoreum is an experimental new digital currency that enables instant, private
- payments to anyone, anywhere in the world. Raptoreum uses peer-to-peer
- technology to operate with no central authority: managing transactions
- and issuing money are carried out collectively by the network. Raptoreum Core
- is the name of the open source software which enables the use of this currency.
- .
- This package provides raptoreum-tx, a command-line transaction creation
- tool which can be used without a raptoreum daemon.  Some means of
- exchanging minimal transaction data with peers is still required.

contrib/devtools/gen-manpages.sh

@@ -9,7 +9,6 @@ MANDIR=${MANDIR:-$TOPDIR/doc/man}
 
 BITCOIND=${BITCOIND:-$SRCDIR/raptoreumd}
 BITCOINCLI=${BITCOINCLI:-$SRCDIR/raptoreum-cli}
-BITCOINTX=${BITCOINTX:-$SRCDIR/raptoreum-tx}
 BITCOINQT=${BITCOINQT:-$SRCDIR/qt/raptoreum-qt}
 
 [ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1
@@ -23,7 +22,7 @@ BTCVER=($($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))
 echo "[COPYRIGHT]" > footer.h2m
 $BITCOIND --version | sed -n '1!p' >> footer.h2m
 
-for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $BITCOINQT; do
+for cmd in $BITCOIND $BITCOINCLI $BITCOINQT; do
   cmdname="${cmd##*/}"
   help2man -N --version-string=${BTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
   sed -i "s/\\\-${BTCVER[1]}//g" ${MANDIR}/${cmdname}.1

doc/man/Makefile.am

@@ -11,7 +11,3 @@ endif
 if BUILD_BITCOIN_CLI
   dist_man1_MANS+=raptoreum-cli.1
 endif
-
-if BUILD_BITCOIN_TX
-  dist_man1_MANS+=raptoreum-tx.1
-endif

docker/build-docker.sh

@@ -14,9 +14,7 @@ rm docker/bin/*
 mkdir docker/bin
 cp $BUILD_DIR/src/raptoreumd docker/bin/
 cp $BUILD_DIR/src/raptoreum-cli docker/bin/
-cp $BUILD_DIR/src/raptoreum-tx docker/bin/
 strip docker/bin/raptoreumd
 strip docker/bin/raptoreum-cli
-strip docker/bin/raptoreum-tx
 
 docker build --pull -t $DOCKER_IMAGE:$DOCKER_TAG -f docker/Dockerfile docker

share/setup.nsi.in

@@ -74,7 +74,6 @@ Section -Main SEC0000
     SetOutPath $INSTDIR\daemon
     File @abs_top_builddir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@
     File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
-    File @abs_top_builddir@/release/@BITCOIN_TX_NAME@@EXEEXT@
     File @abs_top_builddir@/release/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@
     SetOutPath $INSTDIR\doc
     File /r /x Makefile* @abs_top_srcdir@/doc\*.*