diff --git a/.gitignore b/.gitignore index 4b798be87..d6b7961d5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ src/bitcoin src/zcashd src/zcash-cli src/zcash-gtest -src/bitcoin-tx +src/zcash-tx src/test/test_bitcoin src/qt/test/test_bitcoin-qt diff --git a/configure.ac b/configure.ac index e504af39d..aa479792a 100644 --- a/configure.ac +++ b/configure.ac @@ -179,7 +179,7 @@ CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_ AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build bitcoin-cli bitcoin-tx (default=yes)])], + [build zcash-cli zcash-tx (default=yes)])], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -746,7 +746,7 @@ AC_MSG_CHECKING([whether to build bitcoind]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) -AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) +AC_MSG_CHECKING([whether to build utils (zcash-cli zcash-tx)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) diff --git a/src/Makefile.am b/src/Makefile.am index 19243ae76..f9ef1c15a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,7 +66,7 @@ if BUILD_BITCOIND endif if BUILD_BITCOIN_UTILS - bin_PROGRAMS += zcash-cli bitcoin-tx + bin_PROGRAMS += zcash-cli zcash-tx endif LIBZCASH_H = \ @@ -393,17 +393,17 @@ zcash_cli_LDADD = \ $(LIBZCASH_LIBS) # -# bitcoin-tx binary # -bitcoin_tx_SOURCES = bitcoin-tx.cpp -bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES) -bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# zcash-tx binary # +zcash_tx_SOURCES = bitcoin-tx.cpp +zcash_tx_CPPFLAGS = $(BITCOIN_INCLUDES) +zcash_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoin_tx_SOURCES += bitcoin-tx-res.rc +zcash_tx_SOURCES += bitcoin-tx-res.rc endif -# FIXME: Is libzcash needed for bitcoin_tx? -bitcoin_tx_LDADD = \ +# FIXME: Is libzcash needed for zcash_tx? +zcash_tx_LDADD = \ $(LIBBITCOIN_UNIVALUE) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ @@ -412,7 +412,7 @@ bitcoin_tx_LDADD = \ $(LIBBITCOIN_CRYPTO) \ $(LIBZCASH_LIBS) -bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) +zcash_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) # # zcash protocol primitives # diff --git a/src/bitcoin-tx-res.rc b/src/bitcoin-tx-res.rc index 3e49b820b..bc8d57134 100644 --- a/src/bitcoin-tx-res.rc +++ b/src/bitcoin-tx-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" - VALUE "FileDescription", "bitcoin-tx (CLI Bitcoin transaction editor utility)" + VALUE "CompanyName", "Zcash" + VALUE "FileDescription", "zcash-tx (CLI Zcash transaction editor utility)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "bitcoin-tx" + VALUE "InternalName", "zcash-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", "bitcoin-tx.exe" - VALUE "ProductName", "bitcoin-tx" + VALUE "OriginalFilename", "zcash-tx.exe" + VALUE "ProductName", "zcash-tx" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 319be2991..eea9ff541 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -44,10 +44,10 @@ static bool AppInitRawTx(int argc, char* argv[]) if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help")) { // First part of help message is specific to this utility - std::string strUsage = _("Bitcoin Core bitcoin-tx utility version") + " " + FormatFullVersion() + "\n\n" + + std::string strUsage = _("Zcash zcash-tx utility version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " bitcoin-tx [options] [commands] " + _("Update hex-encoded bitcoin transaction") + "\n" + - " bitcoin-tx [options] -create [commands] " + _("Create hex-encoded bitcoin transaction") + "\n" + + " zcash-tx [options] [commands] " + _("Update hex-encoded zcash transaction") + "\n" + + " zcash-tx [options] -create [commands] " + _("Create hex-encoded zcash transaction") + "\n" + "\n"; fprintf(stdout, "%s", strUsage.c_str()); diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json index ddcff21cb..e30c53759 100644 --- a/src/test/data/bitcoin-util-test.json +++ b/src/test/data/bitcoin-util-test.json @@ -1,39 +1,39 @@ [ - { "exec": "././bitcoin-tx", + { "exec": "././zcash-tx", "args": ["-create"], "output_cmp": "blanktx.hex" }, - { "exec": "./bitcoin-tx", + { "exec": "./zcash-tx", "args": ["-"], "input": "blanktx.hex", "output_cmp": "blanktx.hex" }, - { "exec": "./bitcoin-tx", + { "exec": "./zcash-tx", "args": ["-", "delin=1"], "input": "tx394b54bb.hex", "output_cmp": "tt-delin1-out.hex" }, - { "exec": "./bitcoin-tx", + { "exec": "./zcash-tx", "args": ["-", "delin=31"], "input": "tx394b54bb.hex", "return_code": 1 }, - { "exec": "./bitcoin-tx", + { "exec": "./zcash-tx", "args": ["-", "delout=1"], "input": "tx394b54bb.hex", "output_cmp": "tt-delout1-out.hex" }, - { "exec": "./bitcoin-tx", + { "exec": "./zcash-tx", "args": ["-", "delout=2"], "input": "tx394b54bb.hex", "return_code": 1 }, - { "exec": "./bitcoin-tx", + { "exec": "./zcash-tx", "args": ["-", "locktime=317000"], "input": "tx394b54bb.hex", "output_cmp": "tt-locktime317000-out.hex" }, - { "exec": "./bitcoin-tx", + { "exec": "./zcash-tx", "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", @@ -43,11 +43,11 @@ "outaddr=4:t1g1aXFye74HKJ24VviTxo3AW4BZbyCni5H"], "output_cmp": "txcreate1.hex" }, - { "exec": "./bitcoin-tx", + { "exec": "./zcash-tx", "args": ["-create", "outscript=0:"], "output_cmp": "txcreate2.hex" }, - { "exec": "./bitcoin-tx", + { "exec": "./zcash-tx", "args": ["-create", "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",