From 9a40adadda4452330e6ab4d25a73c0d926db0861 Mon Sep 17 00:00:00 2001 From: CodeIsTheKey Date: Sun, 3 Mar 2024 10:51:33 -0700 Subject: [PATCH] Voting updates for mainnet, added height activation for old updates, improved Updates logging, removed raptoreum-tx. --- .gitignore | 2 - Makefile.am | 6 - configure.ac | 20 +- contrib/debian/control | 14 - contrib/debian/raptoreum-tx.bash-completion | 1 - contrib/debian/raptoreum-tx.install | 1 - contrib/debian/raptoreum-tx.manpages | 1 - contrib/devtools/gen-manpages.sh | 3 +- contrib/raptoreum-tx.bash-completion | 57 -- doc/man/Makefile.am | 4 - doc/man/raptoreum-tx.1 | 118 --- docker/build-docker.sh | 2 - share/setup.nsi.in | 1 - src/Makefile.am | 23 - src/chainparams.cpp | 5 +- src/raptoreum-tx-res.rc | 35 - src/raptoreum-tx.cpp | 804 -------------------- src/update/update.cpp | 70 +- src/update/update.h | 6 +- test/lint/lint-locale-dependence.sh | 3 - test/util/bitcoin-util-test.py | 6 +- utils/clean.sh | 1 - 22 files changed, 57 insertions(+), 1126 deletions(-) delete mode 100644 contrib/debian/raptoreum-tx.bash-completion delete mode 100644 contrib/debian/raptoreum-tx.install delete mode 100644 contrib/debian/raptoreum-tx.manpages delete mode 100644 contrib/raptoreum-tx.bash-completion delete mode 100644 doc/man/raptoreum-tx.1 delete mode 100644 src/raptoreum-tx-res.rc delete mode 100644 src/raptoreum-tx.cpp diff --git a/.gitignore b/.gitignore index 082ec6d30e..d371ab7d7a 100644 --- a/.gitignore +++ b/.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 diff --git a/Makefile.am b/Makefile.am index c51631b7b7..a7cc63b9c4 100644 --- a/Makefile.am +++ b/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) diff --git a/configure.ac b/configure.ac index ab0de94b8f..541ff620ad 100644 --- a/configure.ac +++ b/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) diff --git a/contrib/debian/control b/contrib/debian/control index a2755212f3..55e3e327e8 100644 --- a/contrib/debian/control +++ b/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. diff --git a/contrib/debian/raptoreum-tx.bash-completion b/contrib/debian/raptoreum-tx.bash-completion deleted file mode 100644 index 72f63d3f99..0000000000 --- a/contrib/debian/raptoreum-tx.bash-completion +++ /dev/null @@ -1 +0,0 @@ -contrib/raptoreum-tx.bash-completion raptoreum-tx diff --git a/contrib/debian/raptoreum-tx.install b/contrib/debian/raptoreum-tx.install deleted file mode 100644 index cd3d92fe83..0000000000 --- a/contrib/debian/raptoreum-tx.install +++ /dev/null @@ -1 +0,0 @@ -usr/local/bin/raptoreum-tx usr/bin diff --git a/contrib/debian/raptoreum-tx.manpages b/contrib/debian/raptoreum-tx.manpages deleted file mode 100644 index 176637e791..0000000000 --- a/contrib/debian/raptoreum-tx.manpages +++ /dev/null @@ -1 +0,0 @@ -doc/man/raptoreum-tx.1 diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 4d62847e3a..43cf6cc04c 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/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 diff --git a/contrib/raptoreum-tx.bash-completion b/contrib/raptoreum-tx.bash-completion deleted file mode 100644 index 906b145396..0000000000 --- a/contrib/raptoreum-tx.bash-completion +++ /dev/null @@ -1,57 +0,0 @@ -# bash programmable completion for raptoreum-tx(1) -# Copyright (c) 2016 The Bitcoin Core developers -# Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. - -_raptoreum_tx() { - local cur prev words=() cword - local raptoreum_tx - - # save and use original argument to invoke raptoreum-tx for -help - # it might not be in $PATH - raptoreum_tx="$1" - - COMPREPLY=() - _get_comp_words_by_ref -n =: cur prev words cword - - case "$cur" in - load=*:*) - cur="${cur#load=*:}" - _filedir - return 0 - ;; - *=*) # prevent attempts to complete other arguments - return 0 - ;; - esac - - if [[ "$cword" == 1 || ( "$prev" != "-create" && "$prev" == -* ) ]]; then - # only options (or an uncompletable hex-string) allowed - # parse raptoreum-tx -help for options - local helpopts - helpopts=$($raptoreum_tx -help | sed -e '/^ -/ p' -e d ) - COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) ) - else - # only commands are allowed - # parse -help for commands - local helpcmds - helpcmds=$($raptoreum_tx -help | sed -e '1,/Commands:/d' -e 's/=.*/=/' -e '/^ [a-z]/ p' -e d ) - COMPREPLY=( $( compgen -W "$helpcmds" -- "$cur" ) ) - fi - - # Prevent space if an argument is desired - if [[ $COMPREPLY == *= ]]; then - compopt -o nospace - fi - - return 0 -} && -complete -F _raptoreum_tx raptoreum-tx - -# Local variables: -# mode: shell-script -# sh-basic-offset: 4 -# sh-indent-comment: t -# indent-tabs-mode: nil -# End: -# ex: ts=4 sw=4 et filetype=sh diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index e12a5013d6..556c0ace1c 100644 --- a/doc/man/Makefile.am +++ b/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 diff --git a/doc/man/raptoreum-tx.1 b/doc/man/raptoreum-tx.1 deleted file mode 100644 index 4f074b3bdb..0000000000 --- a/doc/man/raptoreum-tx.1 +++ /dev/null @@ -1,118 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. -.TH RAPTOREUM-TX "1" "December 2021" "raptoreum-tx v0.17.0.0" "User Commands" -.SH NAME -raptoreum-tx \- manual page for raptoreum-tx v0.17.0.0 -.SH DESCRIPTION -Raptoreum Core raptoreum\-tx utility version v0.17.0.0 -.SS "Usage:" -.TP -raptoreum\-tx [options] [commands] -Update hex\-encoded raptoreum transaction -.TP -raptoreum\-tx [options] \fB\-create\fR [commands] -Create hex\-encoded raptoreum transaction -.SH OPTIONS -.HP -\-? -.IP -This help message -.HP -\fB\-create\fR -.IP -Create new, empty TX. -.HP -\fB\-json\fR -.IP -Select JSON output -.HP -\fB\-txid\fR -.IP -Output only the hex\-encoded transaction id of the resultant transaction. -.PP -Chain selection options: -.HP -\fB\-devnet=\fR -.IP -Use devnet chain with provided name -.HP -\fB\-testnet\fR -.IP -Use the test chain -.PP -Commands: -.IP -delin=N -.IP -Delete input N from TX -.IP -delout=N -.IP -Delete output N from TX -.IP -in=TXID:VOUT(:SEQUENCE_NUMBER) -.IP -Add input to TX -.IP -locktime=N -.IP -Set TX lock time to N -.IP -nversion=N -.IP -Set TX version to N -.IP -outaddr=VALUE:ADDRESS -.IP -Add address\-based output to TX -.IP -outdata=[VALUE:]DATA -.IP -Add data\-based output to TX -.IP -outmultisig=VALUE:REQUIRED:PUBKEYS:PUBKEY1:PUBKEY2:....[:FLAGS] -.IP -Add Pay To n\-of\-m Multi\-sig output to TX. n = REQUIRED, m = PUBKEYS. -Optionally add the "S" flag to wrap the output in a -pay\-to\-script\-hash. -.IP -outpubkey=VALUE:PUBKEY[:FLAGS] -.IP -Add pay\-to\-pubkey output to TX. Optionally add the "S" flag to wrap the -output in a pay\-to\-script\-hash. -.IP -outscript=VALUE:SCRIPT[:FLAGS] -.IP -Add raw script output to TX. Optionally add the "S" flag to wrap the -output in a pay\-to\-script\-hash. -.IP -sign=SIGHASH\-FLAGS -.IP -Add zero or more signatures to transaction. This command requires JSON -registers:prevtxs=JSON object, privatekeys=JSON object. See -signrawtransaction docs for format of sighash flags, JSON -objects. -.PP -Register Commands: -.IP -load=NAME:FILENAME -.IP -Load JSON file FILENAME into register NAME -.IP -set=NAME:JSON\-STRING -.IP -Set register NAME to given JSON\-STRING -.SH COPYRIGHT -Copyright (C) 2014-2021 The Dash Core developers -Copyright (C) 2009-2021 The Bitcoin Core developers - -Please contribute if you find Raptoreum Core useful. Visit for -further information about the software. -The source code is available from . - -This is experimental software. -Distributed under the MIT software license, see the accompanying file COPYING -or - -This product includes software developed by the OpenSSL Project for use in the -OpenSSL Toolkit and cryptographic software written by -Eric Young and UPnP software written by Thomas Bernard. diff --git a/docker/build-docker.sh b/docker/build-docker.sh index 62c68cb9c2..f344ad58f9 100755 --- a/docker/build-docker.sh +++ b/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 diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 04ede8bff2..e3bb4049d1 100644 --- a/share/setup.nsi.in +++ b/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\*.* diff --git a/src/Makefile.am b/src/Makefile.am index c63de6a862..98bf3ae8e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,9 +105,6 @@ if BUILD_BITCOIN_CLI bin_PROGRAMS += raptoreum-cli endif -if BUILD_BITCOIN_TX - bin_PROGRAMS += raptoreum-tx -endif if ENABLE_WALLET if BUILD_BITCOIN_WALLET bin_PROGRAMS += raptoreum-wallet @@ -799,26 +796,6 @@ raptoreum_cli_LDADD = \ raptoreum_cli_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(EVENT_LIBS) $(BLS_LIBS) $(GMP_LIBS) -# raptoreum-tx binary # -raptoreum_tx_SOURCES = raptoreum-tx.cpp -raptoreum_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -raptoreum_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -raptoreum_tx_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) - -if TARGET_WINDOWS -raptoreum_tx_SOURCES += raptoreum-tx-res.rc -endif - -raptoreum_tx_LDADD = \ - $(LIBUNIVALUE) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ - $(LIBSECP256K1) - -raptoreum_tx_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(BLS_LIBS) $(GMP_LIBS) - # raptoreum-wallet binary # raptoreum_wallet_SOURCES = raptoreum-wallet.cpp raptoreum_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 6217944b96..eff8ef126f 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -207,10 +207,9 @@ class CMainParams : public CChainParams { consensus.nAssetsForkBlock = 9999999; consensus.nRootAssetsForkBlock = consensus.nAssetsForkBlock; - // TODO: JB Need to test these values on mainnet UpdateManager::Instance().Add - ( // Blocks 419329-427391 have version bit set in mainnet, 4031 voting, 4031 grace period - Update(EUpdate::DEPLOYMENT_V17, std::string("v17"), 0, 1, 419329, 4031, 12093, 4031, false, VoteThreshold(80, 60, 5), VoteThreshold(0, 0, 1)) + ( // V17 voting blocks 419328-427391 in mainnet, 4032 voting, 4032 grace period, active at 427392 + Update(EUpdate::DEPLOYMENT_V17, std::string("v17"), 0, 4032, 419328, 1, 3, 1, false, VoteThreshold(80, 60, 5), VoteThreshold(0, 0, 1), false, 427392) ); // UpdateManager::Instance().Add // ( diff --git a/src/raptoreum-tx-res.rc b/src/raptoreum-tx-res.rc deleted file mode 100644 index 776c970ef6..0000000000 --- a/src/raptoreum-tx-res.rc +++ /dev/null @@ -1,35 +0,0 @@ -#include // needed for VERSIONINFO -#include "clientversion.h" // holds the needed client version information - -#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD -#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) -#define VER_FILEVERSION VER_PRODUCTVERSION -#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR - -VS_VERSION_INFO VERSIONINFO -FILEVERSION VER_FILEVERSION -PRODUCTVERSION VER_PRODUCTVERSION -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_APP -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" // U.S. English - multilingual (hex) - BEGIN - VALUE "CompanyName", "Raptoreum" - VALUE "FileDescription", "raptoreum-tx (CLI Raptoreum transaction editor utility)" - VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "raptoreum-tx" - VALUE "LegalCopyright", COPYRIGHT_STR - VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "raptoreum-tx.exe" - VALUE "ProductName", "raptoreum-tx" - VALUE "ProductVersion", VER_PRODUCTVERSION_STR - END - END - - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal) - END -END diff --git a/src/raptoreum-tx.cpp b/src/raptoreum-tx.cpp deleted file mode 100644 index f2d365e50e..0000000000 --- a/src/raptoreum-tx.cpp +++ /dev/null @@ -1,804 +0,0 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#if defined(HAVE_CONFIG_H) -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include