From 1a36126b751e45564a1da9a91309ab4a7a1051e1 Mon Sep 17 00:00:00 2001 From: Beshoy Girgis Date: Sun, 10 Jun 2018 11:34:29 -0500 Subject: [PATCH] Rename executables to bitcoinz (#42) --- Dockerfile | 8 +- INSTALL | 6 +- Makefile.am | 2 +- README.md | 24 +-- configure.ac | 18 +- ...ompletion => bitcoinz-cli.bash-completion} | 40 +++-- ...completion => bitcoinz-tx.bash-completion} | 22 +-- ...h-completion => bitcoinzd.bash-completion} | 17 +- contrib/debian/bitcoinz.install | 4 +- contrib/debian/bitcoinz.manpages | 4 +- contrib/debian/changelog | 6 +- contrib/debian/control | 11 +- contrib/debian/copyright | 6 +- contrib/debian/examples/bitcoinz.conf | 20 +-- contrib/devtools/gen-manpages.sh | 18 +- contrib/devtools/symbol-check.py | 2 +- contrib/docker/cli | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- doc/amqp.md | 24 +-- doc/files.md | 6 +- doc/man/Makefile.am | 2 +- doc/man/{zcash-cli.1 => bitcoinz-cli.1} | 14 +- doc/man/{zcash-tx.1 => bitcoinz-tx.1} | 12 +- doc/man/{zcashd.1 => bitcoinzd.1} | 12 +- doc/payment-api.md | 24 +-- doc/payment-disclosure.md | 10 +- doc/release-notes/release-notes-1.0.12.md | 2 +- doc/security-warnings.md | 8 +- doc/shield-coinbase.md | 14 +- doc/tor.md | 54 +++--- doc/unit-tests.md | 2 +- doc/wallet-backup.md | 32 ++-- doc/zmq.md | 12 +- qa/{zcash => bitcoinz}/checksec.sh | 0 .../create_benchmark_archive.py | 22 +-- .../create_wallet_200k_utxos.py | 0 qa/{zcash => bitcoinz}/full_test_suite.py | 20 +-- .../performance-measurements.sh | 164 +++++++++--------- .../test-depends-sources-mirror.py | 0 qa/docker-run-tests.sh | 2 +- qa/pull-tester/run-bitcoind-for-test.sh.in | 2 +- qa/pull-tester/tests-config.sh.in | 4 +- qa/rpc-tests/zapwallettxes.py | 4 +- src/Makefile.am | 62 +++---- src/bitcoin-cli-res.rc | 10 +- src/bitcoin-cli.cpp | 6 +- src/bitcoin-tx-res.rc | 10 +- src/bitcoin-tx.cpp | 6 +- src/bitcoind-res.rc | 10 +- src/bitcoind.cpp | 14 +- src/clientversion.h | 9 +- src/gtest/test_paymentdisclosure.cpp | 2 +- src/init.cpp | 8 +- src/rpcmining.cpp | 6 +- src/rpcserver.cpp | 2 +- src/sendalert.cpp | 3 +- src/test/data/bitcoin-util-test.json | 20 +-- src/util.cpp | 4 +- src/wallet/rpcdump.cpp | 26 +-- zcutil/build-debian-package.sh | 20 +-- zcutil/get-bitcoinz.sh | 4 +- zcutil/setup-bitcoinz-service.sh | 4 +- 62 files changed, 445 insertions(+), 439 deletions(-) rename contrib/{zcash-cli.bash-completion => bitcoinz-cli.bash-completion} (81%) rename contrib/{zcash-tx.bash-completion => bitcoinz-tx.bash-completion} (67%) rename contrib/{zcashd.bash-completion => bitcoinzd.bash-completion} (78%) rename doc/man/{zcash-cli.1 => bitcoinz-cli.1} (85%) rename doc/man/{zcash-tx.1 => bitcoinz-tx.1} (86%) rename doc/man/{zcashd.1 => bitcoinzd.1} (97%) rename qa/{zcash => bitcoinz}/checksec.sh (100%) rename qa/{zcash => bitcoinz}/create_benchmark_archive.py (89%) rename qa/{zcash => bitcoinz}/create_wallet_200k_utxos.py (100%) rename qa/{zcash => bitcoinz}/full_test_suite.py (88%) rename qa/{zcash => bitcoinz}/performance-measurements.sh (60%) rename qa/{zcash => bitcoinz}/test-depends-sources-mirror.py (100%) diff --git a/Dockerfile b/Dockerfile index 3b8136aa4..560898c27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,10 +46,10 @@ RUN apt-get update \ RUN mkdir -p /bitcoinz/data # Copy binaries from build container -COPY --from=build /usr/local/src/src/zcashd /usr/local/bin -COPY --from=build /usr/local/src/src/zcash-cli /usr/local/bin +COPY --from=build /usr/local/src/src/bitcoinzd /usr/local/bin +COPY --from=build /usr/local/src/src/bitcoinz-cli /usr/local/bin COPY --from=build /usr/local/src/src/zcash-gtest /usr/local/bin -COPY --from=build /usr/local/src/src/zcash-tx /usr/local/bin +COPY --from=build /usr/local/src/src/bitcoinz-tx /usr/local/bin COPY contrib/docker/cli /usr/local/bin RUN chmod +x /usr/local/bin/cli @@ -60,4 +60,4 @@ COPY --from=build /root/.zcash-params /bitcoinz/.zcash-params RUN chown -R bitcoinz: /bitcoinz USER bitcoinz WORKDIR /bitcoinz -CMD ["zcashd", "--datadir=/bitcoinz/data"] +CMD ["bitcoinzd", "-datadir=/bitcoinz/data"] diff --git a/INSTALL b/INSTALL index 647c89a39..af8c6297c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Building Zcash +Building BitcoinZ -See the Zcash github wiki (https://github.com/zcash/zcash/wiki) for instructions on building zcashd, +See the BitcoinZ github wiki (https://github.com/btcz/bitcoinz/wiki) for instructions on building bitcoinzd, the intended-for-services, no-graphical-interface, reference -implementation of Zcash. +implementation of BitcoinZ. diff --git a/Makefile.am b/Makefile.am index a160fe5f4..22755f2e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,7 +149,7 @@ endif dist_bin_SCRIPTS = zcutil/fetch-params.sh dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh -EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zcash $(DIST_DOCS) $(BIN_CHECKS) +EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/bitcoinz $(DIST_DOCS) $(BIN_CHECKS) install-exec-hook: mv $(DESTDIR)$(bindir)/fetch-params.sh $(DESTDIR)$(bindir)/zcash-fetch-params diff --git a/README.md b/README.md index 6283decde..e23aca8f4 100644 --- a/README.md +++ b/README.md @@ -30,23 +30,23 @@ cd bitcoinz/ # fetch key ./zcutil/fetch-params.sh # Run -./src/zcashd +./src/bitcoinzd # Test getting information about the network cd src/ -./zcash-cli getmininginfo +./bitcoinz-cli getmininginfo # Test creating new transparent address -./zcash-cli getnewaddress +./bitcoinz-cli getnewaddress # Test creating new private address -./zcash-cli z_getnewaddress +./bitcoinz-cli z_getnewaddress # Test checking transparent balance -./zcash-cli getbalance +./bitcoinz-cli getbalance # Test checking total balance -./zcash-cli z_gettotalbalance +./bitcoinz-cli z_gettotalbalance # Check all available wallet commands -./zcash-cli help +./bitcoinz-cli help # Get more info about a single wallet command -./zcash-cli help "The-command-you-want-to-learn-more-about" -./zcash-cli help "getbalance" +./bitcoinz-cli help "The-command-you-want-to-learn-more-about" +./bitcoinz-cli help "getbalance" ``` ### Docker @@ -74,8 +74,8 @@ $ docker run -d --name bitcoinz-node \ Verify bitcoinz-node is running ``` $ docker ps -CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -31868a91456d btcz/bitcoinz "zcashd --datadir=..." 2 hours ago Up 2 hours 127.0.0.1:1979->1979/tcp, 0.0.0.0:1989->1989/tcp bitcoinz-node +CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES +31868a91456d btcz/bitcoinz "bitcoinzd --datadir=..." 2 hours ago Up 2 hours 127.0.0.1:1979->1979/tcp, 0.0.0.0:1989->1989/tcp bitcoinz-node ``` Follow the logs @@ -83,7 +83,7 @@ Follow the logs docker logs -f bitcoinz-node ``` -The cli command is a wrapper to zcash-cli that works with an already running Docker container +The cli command is a wrapper to bitcoinz-cli that works with an already running Docker container ``` docker exec -it bitcoinz-node cli help ``` diff --git a/configure.ac b/configure.ac index f3b00cb5d..272a253d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,22 +1,22 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) -define(_CLIENT_VERSION_MINOR, 2) -define(_CLIENT_VERSION_REVISION, 1) +define(_CLIENT_VERSION_MINOR, 3) +define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) -AC_INIT([Zcash],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/zcash/zcash/issues],[zcash]) +AC_INIT([BitcoinZ],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/btcz/bitcoinz/issues],[BitcoinZ]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) -BITCOIN_DAEMON_NAME=zcashd -BITCOIN_CLI_NAME=zcash-cli -BITCOIN_TX_NAME=zcash-tx +BITCOIN_DAEMON_NAME=bitcoinzd +BITCOIN_CLI_NAME=bitcoinz-cli +BITCOIN_TX_NAME=bitcoinz-tx dnl Unless the user specified ARFLAGS, force it to be cr AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to if not set]) @@ -212,7 +212,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS" AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build zcash-cli zcash-tx (default=yes)])], + [build bitcoinz-cli bitcoinz-tx (default=yes)])], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -715,7 +715,7 @@ else LIBSNARK_DEPINST="$prefix" fi -# Additional Zcash flags +# Additional BitcoinZ flags AX_CHECK_COMPILE_FLAG([-fwrapv],[CXXFLAGS="$CXXFLAGS -fwrapv"]) AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing],[CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"]) AX_CHECK_COMPILE_FLAG([-Wno-builtin-declaration-mismatch],[CXXFLAGS="$CXXFLAGS -Wno-builtin-declaration-mismatch"],,[[$CXXFLAG_WERROR]]) @@ -726,7 +726,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 (zcash-cli zcash-tx)]) +AC_MSG_CHECKING([whether to build utils (bitcoinz-cli bitcoinz-tx)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) diff --git a/contrib/zcash-cli.bash-completion b/contrib/bitcoinz-cli.bash-completion similarity index 81% rename from contrib/zcash-cli.bash-completion rename to contrib/bitcoinz-cli.bash-completion index 37fa1d116..521f81191 100644 --- a/contrib/zcash-cli.bash-completion +++ b/contrib/bitcoinz-cli.bash-completion @@ -1,10 +1,12 @@ -# bash programmable completion for zcash-cli(1) -# Copyright (c) 2012-2016 The Bitcoin Core developers +# bash programmable completion for bitcoinz-cli(1) +# Copyright (c) 2017-2018 The BitcoinZ Community +# Copyright (c) 2016-2017 The Zcash developers +# Copyright (c) 2012-2017 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -# call $zcash-cli for RPC -_zcash_rpc() { +# call $bitcoinz-cli for RPC +_bitcoinz_rpc() { # determine already specified args necessary for RPC local rpcargs=() for i in ${COMP_LINE}; do @@ -14,25 +16,25 @@ _zcash_rpc() { ;; esac done - $zcash_cli "${rpcargs[@]}" "$@" + $bitcoinz_cli "${rpcargs[@]}" "$@" } # Add wallet accounts to COMPREPLY -_zcash_accounts() { +_bitcoinz_accounts() { local accounts - # Accounts are deprecated in Zcash - #accounts=$(_zcash_rpc listaccounts | awk -F '"' '{ print $2 }') + # Accounts are deprecated in BitcoinZ + #accounts=$(_bitcoinz_rpc listaccounts | awk -F '"' '{ print $2 }') accounts="\\\"\\\"" COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) ) } -_zcash_cli() { +_bitcoinz_cli() { local cur prev words=() cword - local zcash_cli + local bitcoinz_cli - # save and use original argument to invoke zcash-cli for -help, help and RPC - # as zcash-cli might not be in $PATH - zcash_cli="$1" + # save and use original argument to invoke bitcoinz-cli for -help, help and RPC + # as bitcoinz-cli might not be in $PATH + bitcoinz_cli="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -62,7 +64,7 @@ _zcash_cli() { if ((cword > 3)); then case ${words[cword-3]} in addmultisigaddress) - _zcash_accounts + _bitcoinz_accounts return 0 ;; getbalance|gettxout|importaddress|importpubkey|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock) @@ -91,7 +93,7 @@ _zcash_cli() { return 0 ;; move|setaccount) - _zcash_accounts + _bitcoinz_accounts return 0 ;; esac @@ -107,7 +109,7 @@ _zcash_cli() { return 0 ;; getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany) - _zcash_accounts + _bitcoinz_accounts return 0 ;; esac @@ -131,12 +133,12 @@ _zcash_cli() { # only parse -help if senseful if [[ -z "$cur" || "$cur" =~ ^- ]]; then - helpopts=$($zcash_cli -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($bitcoinz_cli -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) fi # only parse help if senseful if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then - commands=$(_zcash_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') + commands=$(_bitcoinz_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') fi COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) ) @@ -149,7 +151,7 @@ _zcash_cli() { ;; esac } && -complete -F _zcash_cli zcash-cli +complete -F _bitcoinz_cli bitcoinz-cli # Local variables: # mode: shell-script diff --git a/contrib/zcash-tx.bash-completion b/contrib/bitcoinz-tx.bash-completion similarity index 67% rename from contrib/zcash-tx.bash-completion rename to contrib/bitcoinz-tx.bash-completion index e808f93cb..fb030c2c8 100644 --- a/contrib/zcash-tx.bash-completion +++ b/contrib/bitcoinz-tx.bash-completion @@ -1,15 +1,17 @@ -# bash programmable completion for zcash-tx(1) -# Copyright (c) 2016 The Bitcoin Core developers +# bash programmable completion for bitcoinz-tx(1) +# Copyright (c) 2017-2018 The BitcoinZ Community +# Copyright (c) 2016-2017 The Zcash developers +# Copyright (c) 2012-2017 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -_zcash_tx() { +_bitcoinz_tx() { local cur prev words=() cword - local zcash_tx + local bitcoinz_tx - # save and use original argument to invoke zcash-tx for -help + # save and use original argument to invoke bitcoinz-tx for -help # it might not be in $PATH - zcash_tx="$1" + bitcoinz_tx="$1" COMPREPLY=() _get_comp_words_by_ref -n =: cur prev words cword @@ -27,15 +29,15 @@ _zcash_tx() { if [[ "$cword" == 1 || ( "$prev" != "-create" && "$prev" == -* ) ]]; then # only options (or an uncompletable hex-string) allowed - # parse zcash-tx -help for options + # parse bitcoinz-tx -help for options local helpopts - helpopts=$($zcash_tx -help | sed -e '/^ -/ p' -e d ) + helpopts=$($bitcoinz_tx -help | sed -e '/^ -/ p' -e d ) COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) ) else # only commands are allowed # parse -help for commands local helpcmds - helpcmds=$($zcash_tx -help | sed -e '1,/Commands:/d' -e 's/=.*/=/' -e '/^ [a-z]/ p' -e d ) + helpcmds=$($bitcoinz_tx -help | sed -e '1,/Commands:/d' -e 's/=.*/=/' -e '/^ [a-z]/ p' -e d ) COMPREPLY=( $( compgen -W "$helpcmds" -- "$cur" ) ) fi @@ -46,7 +48,7 @@ _zcash_tx() { return 0 } && -complete -F _zcash_tx zcash-tx +complete -F _bitcoinz_tx bitcoinz-tx # Local variables: # mode: shell-script diff --git a/contrib/zcashd.bash-completion b/contrib/bitcoinzd.bash-completion similarity index 78% rename from contrib/zcashd.bash-completion rename to contrib/bitcoinzd.bash-completion index 3a2f091bd..64b320d55 100644 --- a/contrib/zcashd.bash-completion +++ b/contrib/bitcoinzd.bash-completion @@ -1,16 +1,17 @@ -# bash programmable completion for zcashd(1) -# Copyright (c) 2012-2017 The Bitcoin Core developers +# bash programmable completion for bitcoinzd(1) +# Copyright (c) 2017-2018 The BitcoinZ Community # Copyright (c) 2016-2017 The Zcash developers +# Copyright (c) 2012-2017 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -_zcashd() { +_bitcoinzd() { local cur prev words=() cword - local zcashd + local bitcoinzd - # save and use original argument to invoke zcashd for -help + # save and use original argument to invoke bitcoinzd for -help # it might not be in $PATH - zcashd="$1" + bitcoinzd="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -34,7 +35,7 @@ _zcashd() { # only parse -help if senseful if [[ -z "$cur" || "$cur" =~ ^- ]]; then local helpopts - helpopts=$($zcashd -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($bitcoinzd -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) ) fi @@ -46,7 +47,7 @@ _zcashd() { ;; esac } && -complete -F _zcashd zcashd +complete -F _bitcoinzd bitcoinzd # Local variables: # mode: shell-script diff --git a/contrib/debian/bitcoinz.install b/contrib/debian/bitcoinz.install index b39eaeeb3..104d2973d 100644 --- a/contrib/debian/bitcoinz.install +++ b/contrib/debian/bitcoinz.install @@ -1,3 +1,3 @@ -usr/bin/zcashd -usr/bin/zcash-cli +usr/bin/bitcoinzd +usr/bin/bitcoinz-cli usr/bin/zcash-fetch-params diff --git a/contrib/debian/bitcoinz.manpages b/contrib/debian/bitcoinz.manpages index a1115f679..91e2e1137 100644 --- a/contrib/debian/bitcoinz.manpages +++ b/contrib/debian/bitcoinz.manpages @@ -1,2 +1,2 @@ -DEBIAN/manpages/zcash-cli.1 -DEBIAN/manpages/zcashd.1 +DEBIAN/manpages/bitcoinz-cli.1 +DEBIAN/manpages/bitcoinzd.1 diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 7caf641be..c6509473d 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,5 +1,5 @@ -bitcoinz (1.2.1) stable; urgency=medium +bitcoinz (1.3.0) stable; urgency=medium - * 1.2.1 release. + * 1.3.0 release. - -- BitcoinZ team Wed, 16 May 2018 2:08:00 +0100 + -- The BitcoinZ Community Sat, 10 June 2018 00:15:00 +0100 diff --git a/contrib/debian/control b/contrib/debian/control index c78421e42..b1ba34bc7 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,18 +1,17 @@ Source: bitcoinz Section: utils Priority: optional -Maintainer: BitcoinZ team +Maintainer: The BitcoinZ Community Homepage: https://btcz.rocks Build-Depends: autoconf, automake, bsdmainutils, build-essential, git, g++-multilib, libc6-dev, libtool, m4, ncurses-dev, pkg-config, python, unzip, wget, zlib1g-dev -Vcs-Git: https://github.com/bitcoinz-pod/bitcoinz.git -Vcs-Browser: https://github.com/bitcoinz-pod +Vcs-Git: https://github.com/btcz/bitcoinz.git +Vcs-Browser: https://github.com/btcz Package: bitcoinz -Version: 1.2.1 +Version: 1.3.0 Depends: ${shlibs:Depends} Architecture: all -Description: Community coin. - BitcoinZ is based on Bitcoin's & Zcash code. +Description: BitcoinZ is a decentralized community project based on the Bitcoin and Zcash codebase. diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 844ed96f5..dbb015821 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -1,10 +1,10 @@ Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174 Upstream-Name: BitcoinZ -Upstream-Contact: BitcoinZ -Source: https://github.com/bitcoinz-pod/bitcoinz +Upstream-Contact: The BitcoinZ Community +Source: https://github.com/btcz/bitcoinz Files: * -Copyright: 2017-2018 BitcoinZ developers +Copyright: 2017-2018 The BitcoinZ Community 2016-2017, The Zcash developers 2009-2017, Bitcoin Core developers License: Expat diff --git a/contrib/debian/examples/bitcoinz.conf b/contrib/debian/examples/bitcoinz.conf index 637421a25..70ee50bd2 100644 --- a/contrib/debian/examples/bitcoinz.conf +++ b/contrib/debian/examples/bitcoinz.conf @@ -4,7 +4,7 @@ # Network-related settings: -# Run on the test network instead of the real zcash network. +# Run on the test network instead of the real BitcoinZ network. #testnet=0 # Run a regression test network @@ -57,10 +57,10 @@ #maxconnections= # -# JSON-RPC options (for controlling a running Zcash/zcashd process) +# JSON-RPC options (for controlling a running BitcoinZ/bitcoinzd process) # -# server=1 tells zcashd to accept JSON-RPC commands (set as default if not specified) +# server=1 tells bitcoinzd to accept JSON-RPC commands (set as default if not specified) #server=1 # Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. @@ -71,7 +71,7 @@ #rpcuser=Ulysses #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593 -# How many seconds zcash will wait for a complete RPC HTTP request. +# How many seconds BitcoinZ will wait for a complete RPC HTTP request. # after the HTTP connection is established. #rpcclienttimeout=30 @@ -81,7 +81,7 @@ # NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED, # because the rpcpassword is transmitted over the network unencrypted and also because anyone -# that can authenticate on the RPC port can steal your keys + take over the account running zcashd +# that can authenticate on the RPC port can steal your keys + take over the account running bitcoinzd # For more information see https://github.com/zcash/zcash/issues/1497 #rpcallowip=10.1.1.34/255.255.255.0 @@ -91,7 +91,7 @@ # Listen for RPC connections on this TCP port: #rpcport=8232 -# You can use Zcash or zcashd to send commands to Zcash/zcashd +# You can use BitcoinZ or bitcoinzd to send commands to BitcoinZ/bitcoinzd # running on another host using this option: #rpcconnect=127.0.0.1 @@ -106,13 +106,13 @@ # Miscellaneous options -# Enable attempt to mine zcash. +# Enable attempt to mine BitcoinZ. #gen=0 -# Set the number of threads to be used for mining zcash (-1 = all cores). +# Set the number of threads to be used for mining BitcoinZ (-1 = all cores). #genproclimit=1 -# Specify a different Equihash solver (e.g. "tromp") to try to mine zcash +# Specify a different Equihash solver (e.g. "tromp") to try to mine BitcoinZ # faster when gen=1. #equihashsolver=default @@ -120,7 +120,7 @@ # both prior transactions and several dozen future transactions. #keypool=100 -# Pay an optional transaction fee every time you send zcash. Transactions with fees +# Pay an optional transaction fee every time you send BitcoinZ. Transactions with fees # are more likely than free transactions to be included in generated blocks, so may # be validated sooner. This setting does not affect private transactions created with # 'z_sendmany'. diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index be54bc1dd..a2d0f7cf4 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -4,24 +4,24 @@ TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} SRCDIR=${SRCDIR:-$TOPDIR/src} MANDIR=${MANDIR:-$TOPDIR/doc/man} -ZCASHD=${ZCASHD:-$SRCDIR/zcashd} -ZCASHCLI=${ZCASHCLI:-$SRCDIR/zcash-cli} -ZCASHTX=${ZCASHTX:-$SRCDIR/zcash-tx} +BITCOINZD=${BITCOINZD:-$SRCDIR/bitcoinzd} +BITCOINZCLI=${BITCOINZCLI:-$SRCDIR/bitcoinz-cli} +BITCOINZTX=${BITCOINZTX:-$SRCDIR/bitcoinz-tx} -[ ! -x $ZCASHD ] && echo "$ZCASHD not found or not executable." && exit 1 +[ ! -x $BITCOINZD ] && echo "$BITCOINZD not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -ZECVERSTR=$($ZCASHCLI --version | head -n1 | awk '{ print $NF }') +ZECVERSTR=$($BITCOINZCLI --version | head -n1 | awk '{ print $NF }') ZECVER=$(echo $ZECVERSTR | awk -F- '{ OFS="-"; NF--; print $0; }') ZECCOMMIT=$(echo $ZECVERSTR | awk -F- '{ print $NF }') # Create a footer file with copyright content. -# This gets autodetected fine for zcashd if --version-string is not set, -# but has different outcomes for zcash-cli. +# This gets autodetected fine for bitcoinzd if --version-string is not set, +# but has different outcomes for bitcoinz-cli. echo "[COPYRIGHT]" > footer.h2m -$ZCASHD --version | sed -n '1!p' >> footer.h2m +$BITCOINZD --version | sed -n '1!p' >> footer.h2m -for cmd in $ZCASHD $ZCASHCLI $ZCASHTX; do +for cmd in $BITCOINZD $BITCOINZCLI $BITCOINZTX; do cmdname="${cmd##*/}" help2man -N --version-string=$ZECVER --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} sed -i "s/\\\-$ZECCOMMIT//g" ${MANDIR}/${cmdname}.1 diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index 900a80dcf..ec7f687c9 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -53,7 +53,7 @@ CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt') # Allowed NEEDED libraries ALLOWED_LIBRARIES = { -# zcashd +# bitcoinzd 'libgcc_s.so.1', # GCC base support 'libc.so.6', # C library 'libstdc++.so.6', # C++ standard library diff --git a/contrib/docker/cli b/contrib/docker/cli index 52198f9b0..ca50c558d 100644 --- a/contrib/docker/cli +++ b/contrib/docker/cli @@ -1,3 +1,3 @@ #!/bin/bash -exec zcash-cli --datadir=/bitcoinz/data "${@}" +exec bitcoinz-cli --datadir=/bitcoinz/data "${@}" diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 04e25a8d8..bc4f2100a 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoinz-1.2.1" +name: "bitcoinz-1.3.0" enable_cache: true distro: "debian" suites: diff --git a/doc/amqp.md b/doc/amqp.md index 9489c201c..1d840c631 100644 --- a/doc/amqp.md +++ b/doc/amqp.md @@ -6,8 +6,8 @@ transactions between applications. AMQP supports both broker and brokerless messaging. AMQP 1.0 is an open standard and has been ratified as ISO/IEC 19464. -The Zcash daemon can be configured to act as a trusted "border -router", implementing the Zcash P2P protocol and relay, making +The BitcoinZ daemon can be configured to act as a trusted "border +router", implementing the BitcoinZ P2P protocol and relay, making consensus decisions, maintaining the local blockchain database, broadcasting locally generated transactions into the network, and providing a queryable RPC interface to interact on a polled basis for @@ -31,7 +31,7 @@ buffering or reassembly. ## Prerequisites -The AMQP feature in Zcash requires [Qpid Proton](https://qpid.apache.org/proton/) +The AMQP feature in BitcoinZ requires [Qpid Proton](https://qpid.apache.org/proton/) version 0.17 or newer, which you will need to install if you are not using the depends system. Typically, it is packaged by distributions as something like *libqpid-proton*. The C++ wrapper for AMQP *is* required. @@ -44,7 +44,7 @@ daemon operation. By default, the AMQP feature is automatically compiled in if the necessary prerequisites are found. To disable, use --disable-proton -during the *configure* step of building zcashd: +during the *configure* step of building bitcoinzd: $ ./configure --disable-proton (other options) @@ -69,13 +69,13 @@ The address must be a valid AMQP address, where the same address can be used in more than notification. Note that SSL and SASL addresses are not currently supported. -Launch zcashd like this: +Launch bitcoinzd like this: - $ zcashd -amqppubhashtx=amqp://127.0.0.1:5672 + $ bitcoinzd -amqppubhashtx=amqp://127.0.0.1:5672 Or this: - $ zcashd -amqppubhashtx=amqp://127.0.0.1:5672 \ + $ bitcoinzd -amqppubhashtx=amqp://127.0.0.1:5672 \ -amqppubrawtx=amqp://127.0.0.1:5672 \ -amqppubrawblock=amqp://127.0.0.1:5672 \ -amqppubhashblock=amqp://127.0.0.1:5672 \ @@ -96,16 +96,16 @@ AMQP server listening for messages. ## Remarks -From the perspective of zcashd, the local end of an AMQP link is write-only. +From the perspective of bitcoinzd, the local end of an AMQP link is write-only. No information is broadcast that wasn't already received from the public P2P network. -No authentication or authorization is done on peers that zcashd connects +No authentication or authorization is done on peers that bitcoinzd connects to; it is assumed that the AMQP link is exposed only to trusted entities, using other means such as firewalling. -TLS support may be added once OpenSSL has been removed from the Zcash +TLS support may be added once OpenSSL has been removed from the BitcoinZ project and alternative TLS implementations have been evaluated. SASL support may be added in a future update for secure communication. @@ -114,9 +114,9 @@ Note that when the block chain tip changes, a reorganisation may occur and just the tip will be notified. It is up to the subscriber to retrieve the chain from the last known block to the new tip. -At present, zcashd does not try to resend a notification if there was +At present, bitcoinzd does not try to resend a notification if there was a problem confirming receipt. Support for delivery guarantees such as *at-least-once* and *exactly-once* will be added in in a future update. -Currently, zcashd appends an up-counting sequence number to each notification +Currently, bitcoinzd appends an up-counting sequence number to each notification which allows listeners to detect lost notifications. diff --git a/doc/files.md b/doc/files.md index 99666c9ec..7adfea790 100644 --- a/doc/files.md +++ b/doc/files.md @@ -1,12 +1,12 @@ -* bitcoinz.conf: contains configuration settings for zcashd -* zcashd.pid: stores the process id of zcashd while running +* bitcoinz.conf: contains configuration settings for bitcoinzd +* bitcoinzd.pid: stores the process id of bitcoinzd while running * blocks/blk000??.dat: block data (custom, 128 MiB per file) * blocks/rev000??.dat; block undo data (custom) * blocks/index/*; block index (LevelDB) * chainstate/*; block chain state database (LevelDB) * database/*: BDB database environment * db.log: wallet database log file -* debug.log: contains debug information and general logging generated by zcashd +* debug.log: contains debug information and general logging generated by bitcoinzd * fee_estimates.dat: stores statistics used to estimate minimum transaction fees and priorities required for confirmation * peers.dat: peer IP address database (custom format) * wallet.dat: personal wallet (BDB) with keys and transactions diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 27917a208..7a62e1abb 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1 +1 @@ -dist_man1_MANS=zcashd.1 zcash-cli.1 zcash-fetch-params.1 zcash-tx.1 +dist_man1_MANS=bitcoinzd.1 bitcoinz-cli.1 zcash-fetch-params.1 bitcoinz-tx.1 diff --git a/doc/man/zcash-cli.1 b/doc/man/bitcoinz-cli.1 similarity index 85% rename from doc/man/zcash-cli.1 rename to doc/man/bitcoinz-cli.1 index 94d21d97b..7613fac89 100644 --- a/doc/man/zcash-cli.1 +++ b/doc/man/bitcoinz-cli.1 @@ -1,21 +1,21 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASH-CLI "1" "October 2017" "zcash-cli v1.2.1" "User Commands" +.TH BITCOINZ-CLI "1" "June 2018" "bitcoinz-cli v1.3.0" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v1.2.1 +bitcoinz-cli \- manual page for bitcoinz-cli v1.3.0 .SH DESCRIPTION -BitcoinZ RPC client version v1.2.1 +BitcoinZ RPC client version v1.3.0 .PP In order to ensure you are adequately protecting your privacy when using BitcoinZ, please see . .SS "Usage:" .TP -zcash\-cli [options] [params] +bitcoinz\-cli [options] [params] Send command to BitcoinZ .TP -zcash\-cli [options] help +bitcoinz\-cli [options] help List commands .TP -zcash\-cli [options] help +bitcoinz\-cli [options] help Get help for a command .SH OPTIONS .HP @@ -73,7 +73,7 @@ BitcoinZ, please see . Copyright (C) 2009-2017 The Bitcoin Core Developers Copyright (C) 2015-2017 The Zcash Developers Copyright (C) 2015-2017 zdeveloper.org -Copyright (C) 2017-2018 BitcoinZ team +Copyright (C) 2017-2018 The BitcoinZ Community This is experimental software. diff --git a/doc/man/zcash-tx.1 b/doc/man/bitcoinz-tx.1 similarity index 86% rename from doc/man/zcash-tx.1 rename to doc/man/bitcoinz-tx.1 index 1135319b1..2d7e271d0 100644 --- a/doc/man/zcash-tx.1 +++ b/doc/man/bitcoinz-tx.1 @@ -1,15 +1,15 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASH-TX "1" "January 2018" "zcash-tx v1.2.1" "User Commands" +.TH BITCOINZ-TX "1" "June 2018" "bitcoinz-tx v1.3.0" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v1.2.1 +bitcoinz-tx \- manual page for bitcoinz-tx v1.3.0 .SH DESCRIPTION -BitcoinZ zcash\-tx utility version v1.2.1 +BitcoinZ bitcoinz\-tx utility version v1.3.0 .SS "Usage:" .TP -zcash\-tx [options] [commands] +bitcoinz\-tx [options] [commands] Update hex\-encoded BitcoinZ transaction .TP -zcash\-tx [options] \fB\-create\fR [commands] +bitcoinz\-tx [options] \fB\-create\fR [commands] Create hex\-encoded BitcoinZ transaction .SH OPTIONS .HP @@ -91,7 +91,7 @@ BitcoinZ, please see . Copyright (C) 2009-2017 The Bitcoin Core Developers Copyright (C) 2015-2017 The Zcash Developers Copyright (C) 2015-2017 zdeveloper.org -Copyright (C) 2017-2017 BitcoinZ team +Copyright (C) 2017-2018 The BitcoinZ Community This is experimental software. diff --git a/doc/man/zcashd.1 b/doc/man/bitcoinzd.1 similarity index 97% rename from doc/man/zcashd.1 rename to doc/man/bitcoinzd.1 index 0e561e87a..53c7fd92c 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/bitcoinzd.1 @@ -1,15 +1,15 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASHD "1" "October 2017" "zcashd v1.2.1" "User Commands" +.TH BITCOINZD "1" "June 2018" "bitcoinzd v1.3.0" "User Commands" .SH NAME -zcashd \- manual page for zcashd v1.2.1 +bitcoinzd \- manual page for bitcoinzd v1.3.0 .SH DESCRIPTION -BitcoinZ Daemon version v1.2.1 +BitcoinZ Daemon version v1.3.0 .PP In order to ensure you are adequately protecting your privacy when using BitcoinZ, please see . .SS "Usage:" .TP -zcashd [options] +bitcoinzd [options] Start BitcoinZ Daemon .SH OPTIONS .HP @@ -84,7 +84,7 @@ leave that many cores free, default: 0) .HP \fB\-pid=\fR .IP -Specify pid file (default: zcashd.pid) +Specify pid file (default: bitcoinzd.pid) .HP \fB\-prune=\fR .IP @@ -467,7 +467,7 @@ BitcoinZ, please see . Copyright (C) 2009-2017 The Bitcoin Core Developers Copyright (C) 2015-2017 The Zcash Developers Copyright (C) 2015-2017 zdeveloper.org -Copyright (C) 2017-2018 BitcoinZ team +Copyright (C) 2017-2018 The BitcoinZ Community This is experimental software. diff --git a/doc/payment-api.md b/doc/payment-api.md index 1582255bb..263fcd116 100644 --- a/doc/payment-api.md +++ b/doc/payment-api.md @@ -1,28 +1,28 @@ -# Zcash Payment API +# BitcoinZ Payment API ## Overview -Zcash extends the Bitcoin Core API with new RPC calls to support private Zcash payments. +BitcoinZ extends the Bitcoin Core API with new RPC calls to support private BitcoinZ payments. -Zcash payments make use of two address formats: +BitcoinZ payments make use of two address formats: * taddr - an address for transparent funds (just like a Bitcoin address, value stored in UTXOs) * zaddr - an address for private funds (value stored in objects called notes) -When transferring funds from one taddr to another taddr, you can use either the existing Bitcoin RPC calls or the new Zcash RPC calls. +When transferring funds from one taddr to another taddr, you can use either the existing Bitcoin RPC calls or the new BitcoinZ RPC calls. -When a transfer involves zaddrs, you must use the new Zcash RPC calls. +When a transfer involves zaddrs, you must use the new BitcoinZ RPC calls. ## Compatibility with Bitcoin Core -Zcash supports all commands in the Bitcoin Core API (as of version 0.11.2). Where applicable, Zcash will extend commands in a backwards-compatible way to enable additional functionality. +BitcoinZ supports all commands in the Bitcoin Core API (as of version 0.11.2). Where applicable, BitcoinZ will extend commands in a backwards-compatible way to enable additional functionality. We do not recommend use of accounts which are now deprecated in Bitcoin Core. Where the account parameter exists in the API, please use “” as its value, otherwise an error will be returned. To support multiple users in a single node’s wallet, consider using getnewaddress or z_getnewaddress to obtain a new address for each user. Also consider mapping multiple addresses to each user. -## List of Zcash API commands +## List of BitcoinZ API commands Optional parameters are denoted in [square brackets]. @@ -61,10 +61,10 @@ z_validateaddress | zaddr | Return information about a given zaddr.

Outpu Command | Parameters | Description --- | --- | --- -z_exportkey | zaddr | _Requires an unlocked wallet or an unencrypted wallet._

Return a zkey for a given zaddr belonging to the node’s wallet.

The key will be returned as a string formatted using Base58Check as described in the Zcash protocol spec.

Output:AKWUAkypwQjhZ6LLNaMuuuLcmZ6gt5UFyo8m3jGutvALmwZKLdR5 -z_importkey | zkey [rescan=true] | _Wallet must be unlocked._

Add a zkey as returned by z_exportkey to a node's wallet.

The key should be formatted using Base58Check as described in the Zcash protocol spec.

Set rescan to true (the default) to rescan the entire local block database for transactions affecting any address or pubkey script in the wallet (including transactions affecting the newly-added address for this spending key). +z_exportkey | zaddr | _Requires an unlocked wallet or an unencrypted wallet._

Return a zkey for a given zaddr belonging to the node’s wallet.

The key will be returned as a string formatted using Base58Check as described in the BitcoinZ protocol spec.

Output:AKWUAkypwQjhZ6LLNaMuuuLcmZ6gt5UFyo8m3jGutvALmwZKLdR5 +z_importkey | zkey [rescan=true] | _Wallet must be unlocked._

Add a zkey as returned by z_exportkey to a node's wallet.

The key should be formatted using Base58Check as described in the BitcoinZ protocol spec.

Set rescan to true (the default) to rescan the entire local block database for transactions affecting any address or pubkey script in the wallet (including transactions affecting the newly-added address for this spending key). z_exportwallet | filename | _Requires an unlocked wallet or an unencrypted wallet._

Creates or overwrites a file with taddr private keys and zaddr private keys in a human-readable format.

Filename is the file in which the wallet dump will be placed. May be prefaced by an absolute file path. An existing file with that name will be overwritten.

No value is returned but a JSON-RPC error will be reported if a failure occurred. -z_importwallet | filename | _Requires an unlocked wallet or an unencrypted wallet._

Imports private keys from a file in wallet export file format (see z_exportwallet). These keys will be added to the keys currently in the wallet. This call may need to rescan all or parts of the block chain for transactions affecting the newly-added keys, which may take several minutes.

Filename is the file to import. The path is relative to zcashd’s working directory.

No value is returned but a JSON-RPC error will be reported if a failure occurred. +z_importwallet | filename | _Requires an unlocked wallet or an unencrypted wallet._

Imports private keys from a file in wallet export file format (see z_exportwallet). These keys will be added to the keys currently in the wallet. This call may need to rescan all or parts of the block chain for transactions affecting the newly-added keys, which may take several minutes.

Filename is the file to import. The path is relative to bitcoinzd’s working directory.

No value is returned but a JSON-RPC error will be reported if a failure occurred. ### Payment @@ -101,13 +101,13 @@ It is currently not possible to cancel operations. Command | Parameters | Description --- | --- | --- -z_getoperationresult
| [operationids] | Return OperationStatus JSON objects for all completed operations the node is currently aware of, and then remove the operation from memory.

Operationids is an optional array to filter which operations you want to receive status objects for.

Output is a list of operation status objects, where the status is either "failed", "cancelled" or "success".
[
{“operationid”: “opid-11ee…”,
“status”: “cancelled”},
{“operationid”: “opid-9876”, “status”: ”failed”},
{“operationid”: “opid-0e0e”,
“status”:”success”,
“execution_time”:”25”,
“result”: {“txid”:”af3887654…”,...}
},
]

Examples:
zcash-cli z_getoperationresult '["opid-8120fa20-5ee7-4587-957b-f2579c2d882b"]'
zcash-cli z_getoperationresult +z_getoperationresult
| [operationids] | Return OperationStatus JSON objects for all completed operations the node is currently aware of, and then remove the operation from memory.

Operationids is an optional array to filter which operations you want to receive status objects for.

Output is a list of operation status objects, where the status is either "failed", "cancelled" or "success".
[
{“operationid”: “opid-11ee…”,
“status”: “cancelled”},
{“operationid”: “opid-9876”, “status”: ”failed”},
{“operationid”: “opid-0e0e”,
“status”:”success”,
“execution_time”:”25”,
“result”: {“txid”:”af3887654…”,...}
},
]

Examples:
bitcoinz-cli z_getoperationresult '["opid-8120fa20-5ee7-4587-957b-f2579c2d882b"]'
bitcoinz-cli z_getoperationresult z_getoperationstatus
| [operationids] | Return OperationStatus JSON objects for all operations the node is currently aware of.

Operationids is an optional array to filter which operations you want to receive status objects for.

Output is a list of operation status objects.
[
{“operationid”: “opid-12ee…”,
“status”: “queued”},
{“operationid”: “opd-098a…”, “status”: ”executing”},
{“operationid”: “opid-9876”, “status”: ”failed”}
]

When the operation succeeds, the status object will also include the result.

{“operationid”: “opid-0e0e”,
“status”:”success”,
“execution_time”:”25”,
“result”: {“txid”:”af3887654…”,...}
} z_listoperationids
| [state] | Return a list of operationids for all operations which the node is currently aware of.

State is an optional string parameter to filter the operations you want listed by their state. Acceptable parameter values are ‘queued’, ‘executing’, ‘success’, ‘failed’, ‘cancelled’.

[“opid-0e0e…”, “opid-1af4…”, … ] ## Asynchronous RPC call Error Codes -Zcash error codes are defined in https://github.com/zcash/zcash/blob/master/src/rpcprotocol.h +BitcoinZ error codes are defined in https://github.com/btcz/bitcoinz/blob/master/src/rpcprotocol.h ### z_sendmany error codes diff --git a/doc/payment-disclosure.md b/doc/payment-disclosure.md index f998f9434..d6ed4e9d6 100644 --- a/doc/payment-disclosure.md +++ b/doc/payment-disclosure.md @@ -10,9 +10,9 @@ Frequent users of shielded transactions, payment processors, exchanges, block ex ### Experimental Feature -This is an experimental feature. Enable it by launching `zcashd` with flags: +This is an experimental feature. Enable it by launching `bitcoinzd` with flags: - zcashd -experimentalfeatures -paymentdisclosure -debug=paymentdisclosure -txindex=1 + bitcoinzd -experimentalfeatures -paymentdisclosure -debug=paymentdisclosure -txindex=1 These flags can also be set as options in `bitcoinz.conf`. @@ -50,7 +50,7 @@ To validate a payment disclosure, the following RPC call can be used: Generate a payment disclosure for the first joinsplit, second output (index starts from zero): - zcash-cli z_getpaymentdisclosure 79189528d611e811a1c7bb0358dd31343033d14b4c1e998d7c4799c40f8b652b 0 1 "Hello" + bitcoinz-cli z_getpaymentdisclosure 79189528d611e811a1c7bb0358dd31343033d14b4c1e998d7c4799c40f8b652b 0 1 "Hello" This returns a payment disclosure in the form of a hex string: @@ -58,7 +58,7 @@ This returns a payment disclosure in the form of a hex string: To validate the payment disclosure: - zcash-cli z_validatepaymentdisclosure HEXDATA + bitcoinz-cli z_validatepaymentdisclosure HEXDATA This returns data related to the payment and the payment disclosure: @@ -88,7 +88,7 @@ For nodes that only validate payment disclosures, no data is stored locally. For nodes that generate payment disclosures, a LevelDB database is created in the node's datadir. For most users, this would be in the folder: - $HOME/.zcash/paymentdisclosure + $HOME/.bitcoinz/paymentdisclosure If you decide you don't want to use payment disclosure, it is safe to shut down your node and delete the database folder. diff --git a/doc/release-notes/release-notes-1.0.12.md b/doc/release-notes/release-notes-1.0.12.md index 6aa6cd651..615c48c43 100644 --- a/doc/release-notes/release-notes-1.0.12.md +++ b/doc/release-notes/release-notes-1.0.12.md @@ -57,7 +57,7 @@ Simon Liu (5): Set up a clean chain. Delete redundant method wait_until_miner_sees() via use of sync_all(). Implement RPC shield_coinbase #2448. Update which lock to synchronize on when calling GetBestAnchor(). - Closes #2637. Make z_shieldcoinbase an experimental feature where it can be enabled with: zcashd -experimentalfeatures -zshieldcoinbase. + Closes #2637. Make z_shieldcoinbase an experimental feature where it can be enabled with: bitcoinzd -experimentalfeatures -zshieldcoinbase. kpcyrd (2): Fetch params from ipfs if possible diff --git a/doc/security-warnings.md b/doc/security-warnings.md index 0afe110a1..f9635df0f 100644 --- a/doc/security-warnings.md +++ b/doc/security-warnings.md @@ -49,7 +49,7 @@ Side-Channel Attacks This implementation of Zcash is not resistant to side-channel attacks. You should assume (even unprivileged) users who are running on the hardware, or who -are physically near the hardware, that your `zcashd` process is running on will +are physically near the hardware, that your `bitcoinzd` process is running on will be able to: - Determine the values of your secret spending keys, as well as which notes you @@ -64,7 +64,7 @@ be able to: each note ciphertext on the blockchain. You should ensure no other users have the ability to execute code (even -unprivileged) on the hardware your `zcashd` process runs on until these +unprivileged) on the hardware your `bitcoinzd` process runs on until these vulnerabilities are fully analyzed and fixed. REST Interface @@ -77,9 +77,9 @@ security review. RPC Interface --------------- -Users should choose a strong RPC password. If no RPC username and password are set, zcashd will not start and will print an error message with a suggestion for a strong random password. If the client knows the RPC password, they have at least full access to the node. In addition, certain RPC commands can be misused to overwrite files and/or take over the account that is running zcashd. (In the future we may restrict these commands, but full node access – including the ability to spend from and export keys held by the wallet – would still be possible unless wallet methods are disabled.) +Users should choose a strong RPC password. If no RPC username and password are set, bitcoinzd will not start and will print an error message with a suggestion for a strong random password. If the client knows the RPC password, they have at least full access to the node. In addition, certain RPC commands can be misused to overwrite files and/or take over the account that is running bitcoinzd. (In the future we may restrict these commands, but full node access – including the ability to spend from and export keys held by the wallet – would still be possible unless wallet methods are disabled.) -Users should also refrain from changing the default setting that only allows RPC connections from localhost. Allowing connections from remote hosts would enable a MITM to execute arbitrary RPC commands, which could lead to compromise of the account running zcashd and loss of funds. For multi-user services that use one or more zcashd instances on the backend, the parameters passed in by users should be controlled to prevent confused-deputy attacks which could spend from any keys held by that zcashd. +Users should also refrain from changing the default setting that only allows RPC connections from localhost. Allowing connections from remote hosts would enable a MITM to execute arbitrary RPC commands, which could lead to compromise of the account running bitcoinzd and loss of funds. For multi-user services that use one or more bitcoinzd instances on the backend, the parameters passed in by users should be controlled to prevent confused-deputy attacks which could spend from any keys held by that bitcoinzd. Block Chain Reorganization: Major Differences ------------------------------------------------- diff --git a/doc/shield-coinbase.md b/doc/shield-coinbase.md index d3986fec7..4caa089a8 100644 --- a/doc/shield-coinbase.md +++ b/doc/shield-coinbase.md @@ -10,7 +10,7 @@ Miners, Mining pools, Online wallets ## Background -The current Zcash protocol includes a consensus rule that coinbase rewards must be sent to a shielded address. +The current BitcoinZ protocol includes a consensus rule that coinbase rewards must be sent to a shielded address. ## User Experience Challenges @@ -30,19 +30,19 @@ The default fee is 0.0010000 ZEC and the default limit on the maximum number of Sweep up coinbase UTXOs from a transparent address you use for mining: - zcash-cli z_shieldcoinbase tMyMiningAddress zMyPrivateAddress + bitcoinz-cli z_shieldcoinbase tMyMiningAddress zMyPrivateAddress Sweep up coinbase UTXOs from multiple transparent addresses to a shielded address: - zcash-cli z_shieldcoinbase "*" zMyPrivateAddress + bitcoinz-cli z_shieldcoinbase "*" zMyPrivateAddress Sweep up with a fee of 1.23 ZEC: - zcash-cli z_shieldcoinbase tMyMiningAddress zMyPrivateAddress 1.23 + bitcoinz-cli z_shieldcoinbase tMyMiningAddress zMyPrivateAddress 1.23 Sweep up with a fee of 0.1 ZEC and set limit on the maximum number of UTXOs to shield at 25: - zcash-cli z_shieldcoinbase "*" zMyPrivateAddress 0.1 25 + bitcoinz-cli z_shieldcoinbase "*" zMyPrivateAddress 0.1 25 ### Asynchronous Call @@ -50,7 +50,7 @@ The `z_shieldcoinbase` RPC call is an asynchronous call, so you can queue up mul When you invoke - zcash-cli z_shieldcoinbase tMyMiningAddress zMyPrivateAddress + bitcoinz-cli z_shieldcoinbase tMyMiningAddress zMyPrivateAddress JSON will be returned immediately, with the following data fields populated: @@ -70,7 +70,7 @@ You can use the RPC call `lockunspent` to see which UTXOs have been locked. You The number of coinbase UTXOs selected for shielding can be adjusted by setting the limit parameter. The default value is 50. -If the limit parameter is set to zero, the zcashd `mempooltxinputlimit` option will be used instead, where the default value for `mempooltxinputlimit` is zero, which means no limit. +If the limit parameter is set to zero, the bitcoinzd `mempooltxinputlimit` option will be used instead, where the default value for `mempooltxinputlimit` is zero, which means no limit. Any limit is constrained by a hard limit due to the consensus rule defining a maximum transaction size of 100,000 bytes. diff --git a/doc/tor.md b/doc/tor.md index d9ddb87e2..94a862af5 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -1,18 +1,18 @@ -*** Warning: Do not assume Tor support does the correct thing in Zcash; better Tor support is a future feature goal. *** +*** Warning: Do not assume Tor support does the correct thing in BitcoinZ; better Tor support is a future feature goal. *** -TOR SUPPORT IN ZCASH +TOR SUPPORT IN BITCOINZ ==================== -It is possible to run Zcash as a Tor hidden service, and connect to such services. +It is possible to run BitcoinZ as a Tor hidden service, and connect to such services. The following directions assume you have a Tor proxy running on port 9050. Many distributions default to having a SOCKS proxy listening on port 9050, but others may not. In particular, the Tor Browser Bundle defaults to listening on port 9150. See [Tor Project FAQ:TBBSocksPort](https://www.torproject.org/docs/faq.html.en#TBBSocksPort) for how to properly configure Tor. -1. Run Zcash behind a Tor proxy +1. Run BitcoinZ behind a Tor proxy ------------------------------- -The first step is running Zcash behind a Tor proxy. This will already make all +The first step is running BitcoinZ behind a Tor proxy. This will already make all outgoing connections be anonymized, but more is possible. -proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy @@ -33,27 +33,27 @@ outgoing connections be anonymized, but more is possible. In a typical situation, this suffices to run behind a Tor proxy: - ./zcashd -proxy=127.0.0.1:9050 + ./bitcoinzd -proxy=127.0.0.1:9050 -2. Run a Zcash hidden server +2. Run a BitcoinZ hidden server ---------------------------- If you configure your Tor system accordingly, it is possible to make your node also reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent config file): - HiddenServiceDir /var/lib/tor/zcash-service/ + HiddenServiceDir /var/lib/tor/bitcoinz-service/ HiddenServicePort 8233 127.0.0.1:8233 HiddenServicePort 18233 127.0.0.1:18233 The directory can be different of course, but (both) port numbers should be equal to -your zcashd's P2P listen port (8233 by default). +your bitcoinzd's P2P listen port (8233 by default). - -externalip=X You can tell Zcash about its publicly reachable address using + -externalip=X You can tell BitcoinZ about its publicly reachable address using this option, and this can be a .onion address. Given the above configuration, you can find your onion address in - /var/lib/tor/zcash-service/hostname. Onion addresses are given + /var/lib/tor/bitcoinz-service/hostname. Onion addresses are given preference for your node to advertize itself with, for connections coming from unroutable addresses (such as 127.0.0.1, where the Tor proxy typically runs). @@ -70,25 +70,25 @@ your zcashd's P2P listen port (8233 by default). In a typical situation, where you're only reachable via Tor, this should suffice: - ./zcashd -proxy=127.0.0.1:9050 -externalip=zctestseie6wxgio.onion -listen + ./bitcoinzd -proxy=127.0.0.1:9050 -externalip=zctestseie6wxgio.onion -listen (obviously, replace the Onion address with your own). It should be noted that you still listen on all devices and another node could establish a clearnet connection, when knowing your address. To mitigate this, additionally bind the address of your Tor proxy: - ./zcashd ... -bind=127.0.0.1 + ./bitcoinzd ... -bind=127.0.0.1 If you don't care too much about hiding your node, and want to be reachable on IPv4 as well, use `discover` instead: - ./zcashd ... -discover + ./bitcoinzd ... -discover and open port 8233 on your firewall (or use -upnp). If you only want to use Tor to reach onion addresses, but not use it as a proxy for normal IPv4/IPv6 communication, use: - ./zcashd -onion=127.0.0.1:9050 -externalip=zctestseie6wxgio.onion -discover + ./bitcoinzd -onion=127.0.0.1:9050 -externalip=zctestseie6wxgio.onion -discover 3. Automatically listen on Tor @@ -96,42 +96,42 @@ for normal IPv4/IPv6 communication, use: Starting with Tor version 0.2.7.1 it is possible, through Tor's control socket API, to create and destroy 'ephemeral' hidden services programmatically. -Zcash has been updated to make use of this. +BitcoinZ has been updated to make use of this. This means that if Tor is running (and proper authentication has been configured), -Zcash automatically creates a hidden service to listen on. Zcash will also use Tor +BitcoinZ automatically creates a hidden service to listen on. BitcoinZ will also use Tor automatically to connect to other .onion nodes if the control socket can be successfully opened. This will positively affect the number of available .onion nodes and their usage. -This new feature is enabled by default if Zcash is listening (`-listen`), and +This new feature is enabled by default if BitcoinZ is listening (`-listen`), and requires a Tor connection to work. It can be explicitly disabled with `-listenonion=0` and, if not disabled, configured using the `-torcontrol` and `-torpassword` settings. To show verbose debugging information, pass `-debug=tor`. Connecting to Tor's control socket API requires one of two authentication methods to be -configured. For cookie authentication the user running zcashd must have write access +configured. For cookie authentication the user running bitcoinzd must have write access to the `CookieAuthFile` specified in Tor configuration. In some cases this is preconfigured and the creation of a hidden service is automatic. If permission problems are seen with `-debug=tor` they can be resolved by adding both the user running tor and -the user running zcashd to the same group and setting permissions appropriately. On -Debian-based systems the user running zcashd can be added to the debian-tor group, +the user running bitcoinzd to the same group and setting permissions appropriately. On +Debian-based systems the user running bitcoinzd can be added to the debian-tor group, which has the appropriate permissions. An alternative authentication method is the use of the `-torpassword` flag and a `hash-password` which can be enabled and specified in Tor configuration. -4. Connect to a Zcash hidden server +4. Connect to a BitcoinZ hidden server ----------------------------------- To test your set-up, you might want to try connecting via Tor on a different computer to just a -a single Zcash hidden server. Launch zcashd as follows: +a single BitcoinZ hidden server. Launch bitcoinzd as follows: - ./zcashd -onion=127.0.0.1:9050 -connect=zctestseie6wxgio.onion + ./bitcoinzd -onion=127.0.0.1:9050 -connect=zctestseie6wxgio.onion -Now use zcash-cli to verify there is only a single peer connection. +Now use bitcoinz-cli to verify there is only a single peer connection. - zcash-cli getpeerinfo + bitcoinz-cli getpeerinfo [ { @@ -146,4 +146,4 @@ Now use zcash-cli to verify there is only a single peer connection. To connect to multiple Tor nodes, use: - ./zcashd -onion=127.0.0.1:9050 -addnode=zctestseie6wxgio.onion -dnsseed=0 -onlynet=onion + ./bitcoinzd -onion=127.0.0.1:9050 -addnode=zctestseie6wxgio.onion -dnsseed=0 -onlynet=onion diff --git a/doc/unit-tests.md b/doc/unit-tests.md index 97dcd701e..0a7d05857 100644 --- a/doc/unit-tests.md +++ b/doc/unit-tests.md @@ -6,7 +6,7 @@ and tests weren't explicitly disabled. There are two scripts for running tests: -* ``qa/zcash/full-test-suite.sh``, to run the main test suite +* ``qa/bitcoinz/full-test-suite.sh``, to run the main test suite * ``qa/pull-tester/rpc-tests.sh``, to run the RPC tests. The main test suite uses two different testing frameworks. Tests using the Boost diff --git a/doc/wallet-backup.md b/doc/wallet-backup.md index b952adcdb..d2e2afe70 100644 --- a/doc/wallet-backup.md +++ b/doc/wallet-backup.md @@ -2,7 +2,7 @@ ## Overview -Backing up your Zcash private keys is the best way to be proactive about preventing loss of access to your ZEC. +Backing up your BitcoinZ private keys is the best way to be proactive about preventing loss of access to your ZEC. Problems resulting from bugs in the code, user error, device failure, etc. may lead to losing access to your wallet (and as a result, the private keys of addresses which are required to spend from them). @@ -12,27 +12,27 @@ Note that a backup is a duplicate of data needed to spend ZEC so where you keep ## Instructions for backing up your wallet and/or private keys -These instructions are specific for the officially supported Zcash Linux client. For backing up with third-party wallets, please consult with user guides or support channels provided for those services. +These instructions are specific for the officially supported BitcoinZ Linux client. For backing up with third-party wallets, please consult with user guides or support channels provided for those services. There are multiple ways to make sure you have at least one other copy of the private keys needed to spend your ZEC and view your shielded ZEC. -For all methods, you will need to include an export directory setting in your config file (`bitcoinz.conf` located in the data directory which is `~/.zcash/` unless it's been overridden with `datadir=` setting): +For all methods, you will need to include an export directory setting in your config file (`bitcoinz.conf` located in the data directory which is `~/.bitcoinz/` unless it's been overridden with `datadir=` setting): `exportdir=/path/to/chosen/export/directory` You may chose any directory within the home directory as the location for export & backup files. If the directory doesn't exist, it will be created. -Note that zcashd will need to be stopped and restarted for edits in the config file to take effect. +Note that bitcoinzd will need to be stopped and restarted for edits in the config file to take effect. ### Using `backupwallet` To create a backup of your wallet, use: -`zcash-cli backupwallet `. +`bitcoinz-cli backupwallet `. The backup will be an exact copy of the current state of your wallet.dat file stored in the export directory you specified in the config file. The file path will also be returned. -If you generate a new Zcash address, it will not be reflected in the backup file. +If you generate a new BitcoinZ address, it will not be reflected in the backup file. If your original `wallet.dat` file becomes inaccessible for whatever reason, you can use your backup by copying it into your data directory and renaming the copy to `wallet.dat`. @@ -40,52 +40,52 @@ If your original `wallet.dat` file becomes inaccessible for whatever reason, you If you prefer to have an export of your private keys in human readable format, you can use: -`zcash-cli z_exportwallet ` +`bitcoinz-cli z_exportwallet ` This will generate a file in the export directory listing all transparent and shielded private keys with their associated public addresses. The file path will be returned in the command line. To import keys into a wallet which were previously exported to a file, use: -`zcash-cli z_importwallet ` +`bitcoinz-cli z_importwallet ` ### Using `z_exportkey`, `z_importkey`, `dumpprivkey` & `importprivkey` If you prefer to export a single private key for a shielded address, you can use: -`zcash-cli z_exportkey ` +`bitcoinz-cli z_exportkey ` This will return the private key and will not create a new file. For exporting a single private key for a transparent address, you can use the command inherited from Bitcoin: -`zcash-cli dumpprivkey ` +`bitcoinz-cli dumpprivkey ` This will return the private key and will not create a new file. To import a private key for a shielded address, use: -`zcash-cli z_importkey ` +`bitcoinz-cli z_importkey ` This will add the key to your wallet and rescan the wallet for associated transactions if it is not already part of the wallet. The rescanning process can take a few minutes for a new private key. To skip it, instead use: -`zcash-cli z_importkey no` +`bitcoinz-cli z_importkey no` For other instructions on fine-tuning the wallet rescan, see the command's help documentation: -`zcash-cli help z_importkey` +`bitcoinz-cli help z_importkey` To import a private key for a transparent address, use: -`zcash-cli importprivkey ` +`bitcoinz-cli importprivkey ` This has the same functionality as `z_importkey` but works with transparent addresses. See the command's help documentation for instructions on fine-tuning the wallet rescan: -`zcash-cli help importprivkey` +`bitcoinz-cli help importprivkey` ### Using `dumpwallet` -This command inherited from Bitcoin is deprecated. It will export private keys in a similar fashion as `z_exportwallet` but only for transparent addresses. \ No newline at end of file +This command inherited from Bitcoin is deprecated. It will export private keys in a similar fashion as `z_exportwallet` but only for transparent addresses. diff --git a/doc/zmq.md b/doc/zmq.md index 36ef0e1ef..49390b572 100644 --- a/doc/zmq.md +++ b/doc/zmq.md @@ -46,7 +46,7 @@ operation. By default, the ZeroMQ feature is automatically compiled in if the necessary prerequisites are found. To disable, use --disable-zmq -during the *configure* step of building zcashd: +during the *configure* step of building bitcoinzd: $ ./configure --disable-zmq (other options) @@ -67,8 +67,8 @@ address. The same address can be used in more than one notification. For instance: - $ zcashd -zmqpubhashtx=tcp://127.0.0.1:28332 \ - -zmqpubrawtx=ipc:///tmp/zcashd.tx.raw + $ bitcoinzd -zmqpubhashtx=tcp://127.0.0.1:28332 \ + -zmqpubrawtx=ipc:///tmp/bitcoinzd.tx.raw Each PUB notification has a topic and body, where the header corresponds to the notification type. For instance, for the @@ -88,9 +88,9 @@ arriving. Please see `contrib/zmq/zmq_sub.py` for a working example. ## Remarks -From the perspective of zcashd, the ZeroMQ socket is write-only; PUB +From the perspective of bitcoinzd, the ZeroMQ socket is write-only; PUB sockets don't even have a read function. Thus, there is no state -introduced into zcashd directly. Furthermore, no information is +introduced into bitcoinzd directly. Furthermore, no information is broadcast that wasn't already received from the public P2P network. No authentication or authorization is done on connecting clients; it @@ -103,5 +103,5 @@ retrieve the chain from the last known block to the new tip. There are several possibilities that ZMQ notification can get lost during transmission depending on the communication type your are -using. Zcashd appends an up-counting sequence number to each +using. bitcoinzd appends an up-counting sequence number to each notification which allows listeners to detect lost notifications. diff --git a/qa/zcash/checksec.sh b/qa/bitcoinz/checksec.sh similarity index 100% rename from qa/zcash/checksec.sh rename to qa/bitcoinz/checksec.sh diff --git a/qa/zcash/create_benchmark_archive.py b/qa/bitcoinz/create_benchmark_archive.py similarity index 89% rename from qa/zcash/create_benchmark_archive.py rename to qa/bitcoinz/create_benchmark_archive.py index 67ad5b101..b6a82b137 100644 --- a/qa/zcash/create_benchmark_archive.py +++ b/qa/bitcoinz/create_benchmark_archive.py @@ -11,13 +11,13 @@ import tarfile import time -ZCASH_CLI = './src/zcash-cli' +BITCOINZ_CLI = './src/bitcoinz-cli' USAGE = """ Requirements: - find - xz -- %s (edit ZCASH_CLI in this script to alter the path) -- A running mainnet zcashd using the default datadir with -txindex=1 +- %s (edit BITCOINZ_CLI in this script to alter the path) +- A running mainnet bitcoinzd using the default datadir with -txindex=1 Example usage: @@ -26,11 +26,11 @@ . venv/bin/activate pip install --global-option=build_ext --global-option="-L$(pwd)/src/leveldb/" --global-option="-I$(pwd)/src/leveldb/include/" plyvel pip install progressbar2 -LD_LIBRARY_PATH=src/leveldb python qa/zcash/create_benchmark_archive.py -""" % ZCASH_CLI +LD_LIBRARY_PATH=src/leveldb python qa/bitcoinz/create_benchmark_archive.py +""" % BITCOINZ_CLI def check_deps(): - if subprocess.call(['which', 'find', 'xz', ZCASH_CLI], stdout=subprocess.PIPE): + if subprocess.call(['which', 'find', 'xz', BITCOINZ_CLI], stdout=subprocess.PIPE): print USAGE sys.exit() @@ -155,15 +155,15 @@ def deterministic_filter(tarinfo): return tarinfo def create_benchmark_archive(blk_hash): - blk = json.loads(subprocess.check_output([ZCASH_CLI, 'getblock', blk_hash])) + blk = json.loads(subprocess.check_output([BITCOINZ_CLI, 'getblock', blk_hash])) print 'Height: %d' % blk['height'] print 'Transactions: %d' % len(blk['tx']) os.mkdir('benchmark') with open('benchmark/block-%d.dat' % blk['height'], 'wb') as f: - f.write(binascii.unhexlify(subprocess.check_output([ZCASH_CLI, 'getblock', blk_hash, 'false']).strip())) + f.write(binascii.unhexlify(subprocess.check_output([BITCOINZ_CLI, 'getblock', blk_hash, 'false']).strip())) - txs = [json.loads(subprocess.check_output([ZCASH_CLI, 'getrawtransaction', tx, '1']) + txs = [json.loads(subprocess.check_output([BITCOINZ_CLI, 'getrawtransaction', tx, '1']) ) for tx in blk['tx']] js_txs = len([tx for tx in txs if len(tx['vjoinsplit']) > 0]) @@ -188,7 +188,7 @@ def create_benchmark_archive(blk_hash): bar = progressbar.ProgressBar(redirect_stdout=True) print 'Collecting input coins for block' for tx in bar(unique_inputs.keys()): - rawtx = json.loads(subprocess.check_output([ZCASH_CLI, 'getrawtransaction', tx, '1'])) + rawtx = json.loads(subprocess.check_output([BITCOINZ_CLI, 'getrawtransaction', tx, '1'])) mask_size = 0 mask_code = 0 @@ -236,7 +236,7 @@ def create_benchmark_archive(blk_hash): binascii.unhexlify(rawtx['vout'][i]['scriptPubKey']['hex']))) # - VARINT(nHeight) coins.extend(encode_varint(json.loads( - subprocess.check_output([ZCASH_CLI, 'getblockheader', rawtx['blockhash']]) + subprocess.check_output([BITCOINZ_CLI, 'getblockheader', rawtx['blockhash']]) )['height'])) db_key = b'c' + bytes(binascii.unhexlify(tx)[::-1]) diff --git a/qa/zcash/create_wallet_200k_utxos.py b/qa/bitcoinz/create_wallet_200k_utxos.py similarity index 100% rename from qa/zcash/create_wallet_200k_utxos.py rename to qa/bitcoinz/create_wallet_200k_utxos.py diff --git a/qa/zcash/full_test_suite.py b/qa/bitcoinz/full_test_suite.py similarity index 88% rename from qa/zcash/full_test_suite.py rename to qa/bitcoinz/full_test_suite.py index d8a076420..39a57e57b 100755 --- a/qa/zcash/full_test_suite.py +++ b/qa/bitcoinz/full_test_suite.py @@ -31,7 +31,7 @@ def repofile(filename): def test_rpath_runpath(filename): output = subprocess.check_output( - [repofile('qa/zcash/checksec.sh'), '--file', repofile(filename)] + [repofile('qa/bitcoinz/checksec.sh'), '--file', repofile(filename)] ) if RE_RPATH_RUNPATH.search(output): print('PASS: %s has no RPATH or RUNPATH.' % filename) @@ -43,7 +43,7 @@ def test_rpath_runpath(filename): def test_fortify_source(filename): proc = subprocess.Popen( - [repofile('qa/zcash/checksec.sh'), '--fortify-file', repofile(filename)], + [repofile('qa/bitcoinz/checksec.sh'), '--fortify-file', repofile(filename)], stdout=subprocess.PIPE, ) line1 = proc.stdout.readline() @@ -62,21 +62,21 @@ def check_security_hardening(): # PIE, RELRO, Canary, and NX are tested by make check-security. ret &= subprocess.call(['make', '-C', repofile('src'), 'check-security']) == 0 - ret &= test_rpath_runpath('src/zcashd') - ret &= test_rpath_runpath('src/zcash-cli') + ret &= test_rpath_runpath('src/bitcoinzd') + ret &= test_rpath_runpath('src/bitcoinz-cli') ret &= test_rpath_runpath('src/zcash-gtest') - ret &= test_rpath_runpath('src/zcash-tx') + ret &= test_rpath_runpath('src/bitcoinz-tx') ret &= test_rpath_runpath('src/test/test_bitcoin') - ret &= test_rpath_runpath('src/zcash/GenerateParams') + ret &= test_rpath_runpath('src/bitcoinz/GenerateParams') # NOTE: checksec.sh does not reliably determine whether FORTIFY_SOURCE # is enabled for the entire binary. See issue #915. - ret &= test_fortify_source('src/zcashd') - ret &= test_fortify_source('src/zcash-cli') + ret &= test_fortify_source('src/bitcoinzd') + ret &= test_fortify_source('src/bitcoinz-cli') ret &= test_fortify_source('src/zcash-gtest') - ret &= test_fortify_source('src/zcash-tx') + ret &= test_fortify_source('src/bitcoinz-tx') ret &= test_fortify_source('src/test/test_bitcoin') - ret &= test_fortify_source('src/zcash/GenerateParams') + ret &= test_fortify_source('src/bitcoinz/GenerateParams') return ret diff --git a/qa/zcash/performance-measurements.sh b/qa/bitcoinz/performance-measurements.sh similarity index 60% rename from qa/zcash/performance-measurements.sh rename to qa/bitcoinz/performance-measurements.sh index 5d7aa9057..2adb823c0 100755 --- a/qa/zcash/performance-measurements.sh +++ b/qa/bitcoinz/performance-measurements.sh @@ -6,26 +6,26 @@ DATADIR=./benchmark-datadir SHA256CMD="$(command -v sha256sum || echo shasum)" SHA256ARGS="$(command -v sha256sum >/dev/null || echo '-a 256')" -function zcash_rpc { - ./src/zcash-cli -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 "$@" +function bitcoinz_rpc { + ./src/bitcoinz-cli -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 "$@" } -function zcash_rpc_slow { +function bitcoinz_rpc_slow { # Timeout of 1 hour - zcash_rpc -rpcclienttimeout=3600 "$@" + bitcoinz_rpc -rpcclienttimeout=3600 "$@" } -function zcash_rpc_veryslow { +function bitcoinz_rpc_veryslow { # Timeout of 2.5 hours - zcash_rpc -rpcclienttimeout=9000 "$@" + bitcoinz_rpc -rpcclienttimeout=9000 "$@" } -function zcash_rpc_wait_for_start { - zcash_rpc -rpcwait getinfo > /dev/null +function bitcoinz_rpc_wait_for_start { + bitcoinz_rpc -rpcwait getinfo > /dev/null } -function zcashd_generate { - zcash_rpc generate 101 > /dev/null +function bitcoinzd_generate { + bitcoinz_rpc generate 101 > /dev/null } function extract_benchmark_datadir { @@ -40,7 +40,7 @@ EOF ARCHIVE_RESULT=1 fi if [ $ARCHIVE_RESULT -ne 0 ]; then - zcashd_stop + bitcoinzd_stop echo echo "Please download it and place it in the base directory of the repository." exit 1 @@ -54,7 +54,7 @@ function use_200k_benchmark { DATADIR="./benchmark-200k-UTXOs/node$1" } -function zcashd_start { +function bitcoinzd_start { case "$1" in sendtoaddress|loadwallet|listunspent) case "$2" in @@ -65,7 +65,7 @@ function zcashd_start { use_200k_benchmark 1 ;; *) - echo "Bad arguments to zcashd_start." + echo "Bad arguments to bitcoinzd_start." exit 1 esac ;; @@ -74,17 +74,17 @@ function zcashd_start { mkdir -p "$DATADIR/regtest" touch "$DATADIR/bitcoinz.conf" esac - ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & - ZCASHD_PID=$! - zcash_rpc_wait_for_start + ./src/bitcoinzd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & + BITCOINZD_PID=$! + bitcoinz_rpc_wait_for_start } -function zcashd_stop { - zcash_rpc stop > /dev/null - wait $ZCASHD_PID +function bitcoinzd_stop { + bitcoinz_rpc stop > /dev/null + wait $BITCOINZD_PID } -function zcashd_massif_start { +function bitcoinzd_massif_start { case "$1" in sendtoaddress|loadwallet|listunspent) case "$2" in @@ -95,7 +95,7 @@ function zcashd_massif_start { use_200k_benchmark 1 ;; *) - echo "Bad arguments to zcashd_massif_start." + echo "Bad arguments to bitcoinzd_massif_start." exit 1 esac ;; @@ -105,30 +105,30 @@ function zcashd_massif_start { touch "$DATADIR/bitcoinz.conf" esac rm -f massif.out - valgrind --tool=massif --time-unit=ms --massif-out-file=massif.out ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & - ZCASHD_PID=$! - zcash_rpc_wait_for_start + valgrind --tool=massif --time-unit=ms --massif-out-file=massif.out ./src/bitcoinzd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & + BITCOINZD_PID=$! + bitcoinz_rpc_wait_for_start } -function zcashd_massif_stop { - zcash_rpc stop > /dev/null - wait $ZCASHD_PID +function bitcoinzd_massif_stop { + bitcoinz_rpc stop > /dev/null + wait $BITCOINZD_PID ms_print massif.out } -function zcashd_valgrind_start { +function bitcoinzd_valgrind_start { rm -rf "$DATADIR" mkdir -p "$DATADIR/regtest" touch "$DATADIR/bitcoinz.conf" rm -f valgrind.out - valgrind --leak-check=yes -v --error-limit=no --log-file="valgrind.out" ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & - ZCASHD_PID=$! - zcash_rpc_wait_for_start + valgrind --leak-check=yes -v --error-limit=no --log-file="valgrind.out" ./src/bitcoinzd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & + BITCOINZD_PID=$! + bitcoinz_rpc_wait_for_start } -function zcashd_valgrind_stop { - zcash_rpc stop > /dev/null - wait $ZCASHD_PID +function bitcoinzd_valgrind_stop { + bitcoinz_rpc stop > /dev/null + wait $BITCOINZD_PID cat valgrind.out } @@ -144,9 +144,9 @@ EOF ARCHIVE_RESULT=1 fi if [ $ARCHIVE_RESULT -ne 0 ]; then - zcashd_stop + bitcoinzd_stop echo - echo "Please generate it using qa/zcash/create_benchmark_archive.py" + echo "Please generate it using qa/bitcoinz/create_benchmark_archive.py" echo "and place it in the base directory of the repository." echo "Usage details are inside the Python script." exit 1 @@ -166,151 +166,151 @@ case "$1" in *) case "$2" in verifyjoinsplit) - zcashd_start "${@:2}" - RAWJOINSPLIT=$(zcash_rpc zcsamplejoinsplit) - zcashd_stop + bitcoinzd_start "${@:2}" + RAWJOINSPLIT=$(bitcoinz_rpc zcsamplejoinsplit) + bitcoinzd_stop esac esac case "$1" in time) - zcashd_start "${@:2}" + bitcoinzd_start "${@:2}" case "$2" in sleep) - zcash_rpc zcbenchmark sleep 10 + bitcoinz_rpc zcbenchmark sleep 10 ;; parameterloading) - zcash_rpc zcbenchmark parameterloading 10 + bitcoinz_rpc zcbenchmark parameterloading 10 ;; createjoinsplit) - zcash_rpc zcbenchmark createjoinsplit 10 "${@:3}" + bitcoinz_rpc zcbenchmark createjoinsplit 10 "${@:3}" ;; verifyjoinsplit) - zcash_rpc zcbenchmark verifyjoinsplit 1000 "\"$RAWJOINSPLIT\"" + bitcoinz_rpc zcbenchmark verifyjoinsplit 1000 "\"$RAWJOINSPLIT\"" ;; solveequihash) - zcash_rpc_slow zcbenchmark solveequihash 50 "${@:3}" + bitcoinz_rpc_slow zcbenchmark solveequihash 50 "${@:3}" ;; verifyequihash) - zcash_rpc zcbenchmark verifyequihash 1000 + bitcoinz_rpc zcbenchmark verifyequihash 1000 ;; validatelargetx) - zcash_rpc zcbenchmark validatelargetx 5 + bitcoinz_rpc zcbenchmark validatelargetx 5 ;; trydecryptnotes) - zcash_rpc zcbenchmark trydecryptnotes 1000 "${@:3}" + bitcoinz_rpc zcbenchmark trydecryptnotes 1000 "${@:3}" ;; incnotewitnesses) - zcash_rpc zcbenchmark incnotewitnesses 100 "${@:3}" + bitcoinz_rpc zcbenchmark incnotewitnesses 100 "${@:3}" ;; connectblockslow) extract_benchmark_data - zcash_rpc zcbenchmark connectblockslow 10 + bitcoinz_rpc zcbenchmark connectblockslow 10 ;; sendtoaddress) - zcash_rpc zcbenchmark sendtoaddress 10 "${@:4}" + bitcoinz_rpc zcbenchmark sendtoaddress 10 "${@:4}" ;; loadwallet) - zcash_rpc zcbenchmark loadwallet 10 + bitcoinz_rpc zcbenchmark loadwallet 10 ;; listunspent) - zcash_rpc zcbenchmark listunspent 10 + bitcoinz_rpc zcbenchmark listunspent 10 ;; *) - zcashd_stop + bitcoinzd_stop echo "Bad arguments to time." exit 1 esac - zcashd_stop + bitcoinzd_stop ;; memory) - zcashd_massif_start "${@:2}" + bitcoinzd_massif_start "${@:2}" case "$2" in sleep) - zcash_rpc zcbenchmark sleep 1 + bitcoinz_rpc zcbenchmark sleep 1 ;; parameterloading) - zcash_rpc zcbenchmark parameterloading 1 + bitcoinz_rpc zcbenchmark parameterloading 1 ;; createjoinsplit) - zcash_rpc_slow zcbenchmark createjoinsplit 1 "${@:3}" + bitcoinz_rpc_slow zcbenchmark createjoinsplit 1 "${@:3}" ;; verifyjoinsplit) - zcash_rpc zcbenchmark verifyjoinsplit 1 "\"$RAWJOINSPLIT\"" + bitcoinz_rpc zcbenchmark verifyjoinsplit 1 "\"$RAWJOINSPLIT\"" ;; solveequihash) - zcash_rpc_slow zcbenchmark solveequihash 1 "${@:3}" + bitcoinz_rpc_slow zcbenchmark solveequihash 1 "${@:3}" ;; verifyequihash) - zcash_rpc zcbenchmark verifyequihash 1 + bitcoinz_rpc zcbenchmark verifyequihash 1 ;; validatelargetx) - zcash_rpc zcbenchmark validatelargetx 1 + bitcoinz_rpc zcbenchmark validatelargetx 1 ;; trydecryptnotes) - zcash_rpc zcbenchmark trydecryptnotes 1 "${@:3}" + bitcoinz_rpc zcbenchmark trydecryptnotes 1 "${@:3}" ;; incnotewitnesses) - zcash_rpc zcbenchmark incnotewitnesses 1 "${@:3}" + bitcoinz_rpc zcbenchmark incnotewitnesses 1 "${@:3}" ;; connectblockslow) extract_benchmark_data - zcash_rpc zcbenchmark connectblockslow 1 + bitcoinz_rpc zcbenchmark connectblockslow 1 ;; sendtoaddress) - zcash_rpc zcbenchmark sendtoaddress 1 "${@:4}" + bitcoinz_rpc zcbenchmark sendtoaddress 1 "${@:4}" ;; loadwallet) # The initial load is sufficient for measurement ;; listunspent) - zcash_rpc zcbenchmark listunspent 1 + bitcoinz_rpc zcbenchmark listunspent 1 ;; *) - zcashd_massif_stop + bitcoinzd_massif_stop echo "Bad arguments to memory." exit 1 esac - zcashd_massif_stop + bitcoinzd_massif_stop rm -f massif.out ;; valgrind) - zcashd_valgrind_start + bitcoinzd_valgrind_start case "$2" in sleep) - zcash_rpc zcbenchmark sleep 1 + bitcoinz_rpc zcbenchmark sleep 1 ;; parameterloading) - zcash_rpc zcbenchmark parameterloading 1 + bitcoinz_rpc zcbenchmark parameterloading 1 ;; createjoinsplit) - zcash_rpc_veryslow zcbenchmark createjoinsplit 1 "${@:3}" + bitcoinz_rpc_veryslow zcbenchmark createjoinsplit 1 "${@:3}" ;; verifyjoinsplit) - zcash_rpc zcbenchmark verifyjoinsplit 1 "\"$RAWJOINSPLIT\"" + bitcoinz_rpc zcbenchmark verifyjoinsplit 1 "\"$RAWJOINSPLIT\"" ;; solveequihash) - zcash_rpc_veryslow zcbenchmark solveequihash 1 "${@:3}" + bitcoinz_rpc_veryslow zcbenchmark solveequihash 1 "${@:3}" ;; verifyequihash) - zcash_rpc zcbenchmark verifyequihash 1 + bitcoinz_rpc zcbenchmark verifyequihash 1 ;; trydecryptnotes) - zcash_rpc zcbenchmark trydecryptnotes 1 "${@:3}" + bitcoinz_rpc zcbenchmark trydecryptnotes 1 "${@:3}" ;; incnotewitnesses) - zcash_rpc zcbenchmark incnotewitnesses 1 "${@:3}" + bitcoinz_rpc zcbenchmark incnotewitnesses 1 "${@:3}" ;; connectblockslow) extract_benchmark_data - zcash_rpc zcbenchmark connectblockslow 1 + bitcoinz_rpc zcbenchmark connectblockslow 1 ;; *) - zcashd_valgrind_stop + bitcoinzd_valgrind_stop echo "Bad arguments to valgrind." exit 1 esac - zcashd_valgrind_stop + bitcoinzd_valgrind_stop rm -f valgrind.out ;; valgrind-tests) diff --git a/qa/zcash/test-depends-sources-mirror.py b/qa/bitcoinz/test-depends-sources-mirror.py similarity index 100% rename from qa/zcash/test-depends-sources-mirror.py rename to qa/bitcoinz/test-depends-sources-mirror.py diff --git a/qa/docker-run-tests.sh b/qa/docker-run-tests.sh index ae9dfd2cb..ca009f060 100755 --- a/qa/docker-run-tests.sh +++ b/qa/docker-run-tests.sh @@ -3,5 +3,5 @@ set -e docker build -f ./qa/Dockerfile.test -t btcz/bitcoinz-test . -docker run -it --rm btcz/bitcoinz-test ./qa/zcash/full_test_suite.py +docker run -it --rm btcz/bitcoinz-test ./qa/bitcoinz/full_test_suite.py docker run -it --rm btcz/bitcoinz-test ./qa/pull-tester/rpc-tests.sh diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in index 60255acd5..4a8177d0d 100755 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -12,7 +12,7 @@ touch "$DATADIR/regtest/debug.log" tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! PORT=`expr 10000 + $$ % 55536` -"@abs_top_builddir@/src/zcashd@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & +"@abs_top_builddir@/src/bitcoinzd@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & BITCOIND=$! #Install a watchdog. diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in index cc76e8ad8..65ac618b9 100755 --- a/qa/pull-tester/tests-config.sh.in +++ b/qa/pull-tester/tests-config.sh.in @@ -13,6 +13,6 @@ EXEEXT="@EXEEXT@" @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 @ENABLE_PROTON_TRUE@ENABLE_PROTON=1 -REAL_BITCOIND="$BUILDDIR/src/zcashd${EXEEXT}" -REAL_BITCOINCLI="$BUILDDIR/src/zcash-cli${EXEEXT}" +REAL_BITCOIND="$BUILDDIR/src/bitcoinzd${EXEEXT}" +REAL_BITCOINCLI="$BUILDDIR/src/bitcoinz-cli${EXEEXT}" diff --git a/qa/rpc-tests/zapwallettxes.py b/qa/rpc-tests/zapwallettxes.py index e999204cb..e29685ac9 100755 --- a/qa/rpc-tests/zapwallettxes.py +++ b/qa/rpc-tests/zapwallettxes.py @@ -53,7 +53,7 @@ def run_test (self): tx3 = self.nodes[0].gettransaction(txid3) assert_equal(tx3['txid'], txid3) # tx3 must be available (unconfirmed) - # restart zcashd + # restart bitcoinzd self.nodes[0].stop() bitcoind_processes[0].wait() self.nodes[0] = start_node(0,self.options.tmpdir) @@ -64,7 +64,7 @@ def run_test (self): self.nodes[0].stop() bitcoind_processes[0].wait() - # restart zcashd with zapwallettxes + # restart bitcoinzd with zapwallettxes self.nodes[0] = start_node(0,self.options.tmpdir, ["-zapwallettxes=1"]) aException = False diff --git a/src/Makefile.am b/src/Makefile.am index 44b4d8281..64acf9aac 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,11 +88,11 @@ noinst_PROGRAMS = TESTS = if BUILD_BITCOIND - bin_PROGRAMS += zcashd + bin_PROGRAMS += bitcoinzd endif if BUILD_BITCOIN_UTILS - bin_PROGRAMS += zcash-cli zcash-tx + bin_PROGRAMS += bitcoinz-cli bitcoinz-tx endif LIBZCASH_H = \ @@ -222,7 +222,7 @@ obj/build.h: FORCE $(abs_top_srcdir) libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h -# server: zcashd +# server: bitcoinzd libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_server_a_SOURCES = \ @@ -288,7 +288,7 @@ libbitcoin_proton_a_SOURCES = \ amqp/amqppublishnotifier.cpp endif -# wallet: zcashd, but only linked when wallet enabled +# wallet: bitcoinzd, but only linked when wallet enabled libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_wallet_a_SOURCES = \ @@ -344,7 +344,7 @@ crypto_libbitcoin_crypto_a_SOURCES += \ ${EQUIHASH_TROMP_SOURCES} endif -# common: shared between zcashd and non-server tools +# common: shared between bitcoinzd and non-server tools libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_common_a_SOURCES = \ @@ -401,7 +401,7 @@ if GLIBC_BACK_COMPAT libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp endif -# cli: zcash-cli +# cli: bitcoinz-cli libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_cli_a_SOURCES = \ @@ -413,16 +413,16 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # # bitcoind binary # -zcashd_SOURCES = bitcoind.cpp -zcashd_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -zcashd_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -zcashd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +bitcoinzd_SOURCES = bitcoind.cpp +bitcoinzd_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +bitcoinzd_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +bitcoinzd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -zcashd_SOURCES += bitcoind-res.rc +bitcoinzd_SOURCES += bitcoind-res.rc endif -zcashd_LDADD = \ +bitcoinzd_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBUNIVALUE) \ @@ -435,14 +435,14 @@ zcashd_LDADD = \ $(LIBSECP256K1) if ENABLE_ZMQ -zcashd_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +bitcoinzd_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif if ENABLE_WALLET -zcashd_LDADD += libbitcoin_wallet.a +bitcoinzd_LDADD += libbitcoin_wallet.a endif -zcashd_LDADD += \ +bitcoinzd_LDADD += \ $(BOOST_LIBS) \ $(BDB_LIBS) \ $(SSL_LIBS) \ @@ -453,20 +453,20 @@ zcashd_LDADD += \ $(LIBZCASH_LIBS) if ENABLE_PROTON -zcashd_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS) +bitcoinzd_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS) endif # bitcoin-cli binary # -zcash_cli_SOURCES = bitcoin-cli.cpp -zcash_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) -zcash_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -zcash_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +bitcoinz_cli_SOURCES = bitcoin-cli.cpp +bitcoinz_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) +bitcoinz_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +bitcoinz_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -zcash_cli_SOURCES += bitcoin-cli-res.rc +bitcoinz_cli_SOURCES += bitcoin-cli-res.rc endif -zcash_cli_LDADD = \ +bitcoinz_cli_LDADD = \ $(LIBBITCOIN_CLI) \ $(LIBUNIVALUE) \ $(LIBBITCOIN_UTIL) \ @@ -480,18 +480,18 @@ zcash_cli_LDADD = \ $(LIBZCASH_LIBS) # -# zcash-tx binary # -zcash_tx_SOURCES = bitcoin-tx.cpp -zcash_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -zcash_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -zcash_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# bitcoinz-tx binary # +bitcoinz_tx_SOURCES = bitcoin-tx.cpp +bitcoinz_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +bitcoinz_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +bitcoinz_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -zcash_tx_SOURCES += bitcoin-tx-res.rc +bitcoinz_tx_SOURCES += bitcoin-tx-res.rc endif -# FIXME: Is libzcash needed for zcash_tx? -zcash_tx_LDADD = \ +# FIXME: Is libzcash needed for bitcoinz_tx? +bitcoinz_tx_LDADD = \ $(LIBUNIVALUE) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ @@ -501,7 +501,7 @@ zcash_tx_LDADD = \ $(LIBBITCOIN_CRYPTO) \ $(LIBZCASH_LIBS) -zcash_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) +bitcoinz_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) # # zcash protocol primitives # diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc index d365e0b49..113ee91fa 100644 --- a/src/bitcoin-cli-res.rc +++ b/src/bitcoin-cli-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Zcash" - VALUE "FileDescription", "zcash-cli (JSON-RPC client for Zcash)" + VALUE "CompanyName", "BitcoinZ" + VALUE "FileDescription", "bitcoinz-cli (JSON-RPC client for BitcoinZ)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "zcash-cli" + VALUE "InternalName", "bitcoinz-cli" 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", "zcash-cli.exe" - VALUE "ProductName", "zcash-cli" + VALUE "OriginalFilename", "bitcoinz-cli.exe" + VALUE "ProductName", "bitcoinz-cli" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 0ffd214b1..66fd330b0 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -72,9 +72,9 @@ static bool AppInitRPC(int argc, char* argv[]) std::string strUsage = _("BitcoinZ RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (!mapArgs.count("-version")) { strUsage += "\n" + _("Usage:") + "\n" + - " zcash-cli [options] [params] " + _("Send command to BitcoinZ") + "\n" + - " zcash-cli [options] help " + _("List commands") + "\n" + - " zcash-cli [options] help " + _("Get help for a command") + "\n"; + " bitcoinz-cli [options] [params] " + _("Send command to BitcoinZ") + "\n" + + " bitcoinz-cli [options] help " + _("List commands") + "\n" + + " bitcoinz-cli [options] help " + _("Get help for a command") + "\n"; strUsage += "\n" + HelpMessageCli(); } else { diff --git a/src/bitcoin-tx-res.rc b/src/bitcoin-tx-res.rc index bc8d57134..39305e28d 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", "Zcash" - VALUE "FileDescription", "zcash-tx (CLI Zcash transaction editor utility)" + VALUE "CompanyName", "BitcoinZ" + VALUE "FileDescription", "bitcoinz-tx (CLI BitcoinZ transaction editor utility)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "zcash-tx" + VALUE "InternalName", "bitcoinz-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", "zcash-tx.exe" - VALUE "ProductName", "zcash-tx" + VALUE "OriginalFilename", "bitcoinz-tx.exe" + VALUE "ProductName", "bitcoinz-tx" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 1d9446e43..af5810379 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 = _("BitcoinZ zcash-tx utility version") + " " + FormatFullVersion() + "\n\n" + + std::string strUsage = _("BitcoinZ bitcoinz-tx utility version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " zcash-tx [options] [commands] " + _("Update hex-encoded BitcoinZ transaction") + "\n" + - " zcash-tx [options] -create [commands] " + _("Create hex-encoded BitcoinZ transaction") + "\n" + + " bitcoinz-tx [options] [commands] " + _("Update hex-encoded BitcoinZ transaction") + "\n" + + " bitcoinz-tx [options] -create [commands] " + _("Create hex-encoded BitcoinZ transaction") + "\n" + "\n"; fprintf(stdout, "%s", strUsage.c_str()); diff --git a/src/bitcoind-res.rc b/src/bitcoind-res.rc index eeb6fde52..079b7d885 100644 --- a/src/bitcoind-res.rc +++ b/src/bitcoind-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Zcash" - VALUE "FileDescription", "zcashd (Zcash node with a JSON-RPC server)" + VALUE "CompanyName", "BitcoinZ" + VALUE "FileDescription", "bitcoinzd (BitcoinZ node with a JSON-RPC server)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "zcashd" + VALUE "InternalName", "bitcoinzd" 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", "zcashd.exe" - VALUE "ProductName", "zcashd" + VALUE "OriginalFilename", "bitcoinzd.exe" + VALUE "ProductName", "bitcoinzd" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index a6f1e64e0..d166e50b2 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -82,7 +82,7 @@ bool AppInit(int argc, char* argv[]) else { strUsage += "\n" + _("Usage:") + "\n" + - " zcashd [options] " + _("Start BitcoinZ Daemon") + "\n"; + " bitcoinzd [options] " + _("Start BitcoinZ Daemon") + "\n"; strUsage += "\n" + HelpMessage(HMM_BITCOIND); } @@ -103,11 +103,11 @@ bool AppInit(int argc, char* argv[]) ReadConfigFile(mapArgs, mapMultiArgs); } catch (const missing_zcash_conf& e) { fprintf(stderr, - (_("Before starting zcashd, you need to create a configuration file:\n" + (_("Before starting bitcoinzd, you need to create a configuration file:\n" "%s\n" "It can be completely empty! That indicates you are happy with the default\n" - "configuration of zcashd. But requiring a configuration file to start ensures\n" - "that zcashd won't accidentally compromise your privacy if there was a default\n" + "configuration of bitcoinzd. But requiring a configuration file to start ensures\n" + "that bitcoinzd won't accidentally compromise your privacy if there was a default\n" "option you needed to change.\n" "\n" "You can look at the example configuration file for suggestions of default\n" @@ -117,7 +117,7 @@ bool AppInit(int argc, char* argv[]) "- .deb package: %s\n")).c_str(), GetConfigFile().string().c_str(), "contrib/debian/examples/bitcoinz.conf", - "/usr/share/doc/zcash/examples/bitcoinz.conf"); + "/usr/share/doc/bitcoinz/examples/bitcoinz.conf"); return false; } catch (const std::exception& e) { fprintf(stderr,"Error reading configuration file: %s\n", e.what()); @@ -132,12 +132,12 @@ bool AppInit(int argc, char* argv[]) // Command-line RPC bool fCommandLine = false; for (int i = 1; i < argc; i++) - if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "zcash:")) + if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "bitcoinz:")) fCommandLine = true; if (fCommandLine) { - fprintf(stderr, "Error: There is no RPC client functionality in zcashd. Use the zcash-cli utility instead.\n"); + fprintf(stderr, "Error: There is no RPC client functionality in bitcoinzd. Use the bitcoinz-cli utility instead.\n"); exit(1); } #ifndef WIN32 diff --git a/src/clientversion.h b/src/clientversion.h index 4231f77f4..1544fce57 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -1,5 +1,6 @@ -// Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2017-2018 The BitcoinZ Community // Copyright (c) 2016-2017 The Zcash developers +// Copyright (c) 2009-2014 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -16,8 +17,8 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 1 -#define CLIENT_VERSION_MINOR 2 -#define CLIENT_VERSION_REVISION 1 +#define CLIENT_VERSION_MINOR 3 +#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build @@ -39,7 +40,7 @@ #define DO_STRINGIZE(X) #X //! Copyright string used in Windows .rc files -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers and The BitcoinZ developers" +#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers and The BitcoinZ Community" /** * bitcoind-res.rc includes this file, but it cannot cope with real c++ code. diff --git a/src/gtest/test_paymentdisclosure.cpp b/src/gtest/test_paymentdisclosure.cpp index ddab3c7e6..eb674f65c 100644 --- a/src/gtest/test_paymentdisclosure.cpp +++ b/src/gtest/test_paymentdisclosure.cpp @@ -131,7 +131,7 @@ TEST(paymentdisclosure, mainnet) { // Modify this local variable and confirm it no longer matches info2.esk = random_uint256(); info2.joinSplitPrivKey = random_uint256(); - info2.zaddr = libzcash::SpendingKey::random().address(); + info2.zaddr = libzcash::SpendingKey::random().address(); ASSERT_NE(info, info2); // Using the payment info object, let's create a dummy payload diff --git a/src/init.cpp b/src/init.cpp index cd410a32f..d491e55e0 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -356,7 +356,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-par=", strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"), -GetNumCores(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS)); #ifndef WIN32 - strUsage += HelpMessageOpt("-pid=", strprintf(_("Specify pid file (default: %s)"), "zcashd.pid")); + strUsage += HelpMessageOpt("-pid=", strprintf(_("Specify pid file (default: %s)"), "bitcoinzd.pid")); #endif strUsage += HelpMessageOpt("-prune=", strprintf(_("Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. " "Warning: Reverting this setting requires re-downloading the entire blockchain. " @@ -1122,7 +1122,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) libsnark::inhibit_profiling_info = true; libsnark::inhibit_profiling_counters = true; - // Initialize Zcash circuit parameters + // Initialize BitcoinZ circuit parameters ZC_LoadParams(); /* Start the RPC server already. It will be started in "warmup" mode @@ -1489,10 +1489,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) InitWarning(msg); } else if (nLoadWalletRet == DB_TOO_NEW) - strErrors << _("Error loading wallet.dat: Wallet requires newer version of Zcash") << "\n"; + strErrors << _("Error loading wallet.dat: Wallet requires newer version of BitcoinZ") << "\n"; else if (nLoadWalletRet == DB_NEED_REWRITE) { - strErrors << _("Wallet needed to be rewritten: restart Zcash to complete") << "\n"; + strErrors << _("Wallet needed to be rewritten: restart BitcoinZ to complete") << "\n"; LogPrintf("%s", strErrors.str()); return InitError(strErrors.str()); } diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 2ea0e1337..9dac0002f 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -179,7 +179,7 @@ UniValue generate(const UniValue& params, bool fHelp) throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Wallet disabled and -mineraddress not set"); } #else - throw JSONRPCError(RPC_METHOD_NOT_FOUND, "zcashd compiled without wallet and -mineraddress not set"); + throw JSONRPCError(RPC_METHOD_NOT_FOUND, "bitcoinzd compiled without wallet and -mineraddress not set"); #endif } if (!Params().MineBlocksOnDemand()) @@ -303,7 +303,7 @@ UniValue setgenerate(const UniValue& params, bool fHelp) throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Wallet disabled and -mineraddress not set"); } #else - throw JSONRPCError(RPC_METHOD_NOT_FOUND, "zcashd compiled without wallet and -mineraddress not set"); + throw JSONRPCError(RPC_METHOD_NOT_FOUND, "bitcoinzd compiled without wallet and -mineraddress not set"); #endif } if (Params().MineBlocksOnDemand()) @@ -505,7 +505,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp) throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Wallet disabled and -mineraddress not set"); } #else - throw JSONRPCError(RPC_METHOD_NOT_FOUND, "zcashd compiled without wallet and -mineraddress not set"); + throw JSONRPCError(RPC_METHOD_NOT_FOUND, "bitcoinzd compiled without wallet and -mineraddress not set"); #endif } diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 42ba65ea3..bb975a70d 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -587,7 +587,7 @@ UniValue CRPCTable::execute(const std::string &strMethod, const UniValue ¶ms std::string HelpExampleCli(const std::string& methodname, const std::string& args) { - return "> zcash-cli " + methodname + " " + args + "\n"; + return "> bitcoinz-cli " + methodname + " " + args + "\n"; } std::string HelpExampleRpc(const std::string& methodname, const std::string& args) diff --git a/src/sendalert.cpp b/src/sendalert.cpp index 46ca93bb8..196942a9b 100644 --- a/src/sendalert.cpp +++ b/src/sendalert.cpp @@ -1,3 +1,4 @@ +// Copyright (c) 2018 The BitcoinZ Community // Copyright (c) 2016 The Zcash developers // Original code from: https://gist.github.com/laanwj/0e689cfa37b52bcbbb44 @@ -27,7 +28,7 @@ Modify the alert parameters, id and message found in this file. Build and run with -sendalert or -printalert. -./zcashd -printtoconsole -sendalert +./bitcoinzd -printtoconsole -sendalert One minute after starting up, the alert will be broadcast. It is then flooded through the network until the nRelayUntil time, and will be diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json index c23befe23..47e03ea1a 100644 --- a/src/test/data/bitcoin-util-test.json +++ b/src/test/data/bitcoin-util-test.json @@ -1,39 +1,39 @@ [ - { "exec": "././zcash-tx", + { "exec": "././bitcoinz-tx", "args": ["-create"], "output_cmp": "blanktx.hex" }, - { "exec": "./zcash-tx", + { "exec": "./bitcoinz-tx", "args": ["-"], "input": "blanktx.hex", "output_cmp": "blanktx.hex" }, - { "exec": "./zcash-tx", + { "exec": "./bitcoinz-tx", "args": ["-", "delin=1"], "input": "tx394b54bb.hex", "output_cmp": "tt-delin1-out.hex" }, - { "exec": "./zcash-tx", + { "exec": "./bitcoinz-tx", "args": ["-", "delin=31"], "input": "tx394b54bb.hex", "return_code": 1 }, - { "exec": "./zcash-tx", + { "exec": "./bitcoinz-tx", "args": ["-", "delout=1"], "input": "tx394b54bb.hex", "output_cmp": "tt-delout1-out.hex" }, - { "exec": "./zcash-tx", + { "exec": "./bitcoinz-tx", "args": ["-", "delout=2"], "input": "tx394b54bb.hex", "return_code": 1 }, - { "exec": "./zcash-tx", + { "exec": "./bitcoinz-tx", "args": ["-", "locktime=317000"], "input": "tx394b54bb.hex", "output_cmp": "tt-locktime317000-out.hex" }, - { "exec": "./zcash-tx", + { "exec": "./bitcoinz-tx", "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", @@ -43,11 +43,11 @@ "outaddr=4:t1g1aXFye74HKJ24VviTxo3AW4BZbyCni5H"], "output_cmp": "txcreate1.hex" }, - { "exec": "./zcash-tx", + { "exec": "./bitcoinz-tx", "args": ["-create", "outscript=0:"], "output_cmp": "txcreate2.hex" }, - { "exec": "./zcash-tx", + { "exec": "./bitcoinz-tx", "args": ["-create", "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0", diff --git a/src/util.cpp b/src/util.cpp index 2b4b1b3fa..786da6aba 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -618,7 +618,7 @@ void ReadConfigFile(map& mapSettingsRet, #ifndef WIN32 boost::filesystem::path GetPidFile() { - boost::filesystem::path pathPidFile(GetArg("-pid", "zcashd.pid")); + boost::filesystem::path pathPidFile(GetArg("-pid", "bitcoinzd.pid")); if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile; return pathPidFile; } @@ -901,7 +901,7 @@ std::string LicenseInfo() FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2015-%i The Zcash Developers"), COPYRIGHT_YEAR)) + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2015-%i zdeveloper.org"), COPYRIGHT_YEAR)) + "\n" + - FormatParagraph(strprintf(_("Copyright (C) 2017-%i BitcoinZ team"), COPYRIGHT_YEAR)) + "\n" + + FormatParagraph(strprintf(_("Copyright (C) 2017-%i BitcoinZ Core Developers"), COPYRIGHT_YEAR)) + "\n" + "\n" + FormatParagraph(_("This is experimental software.")) + "\n" + "\n" + diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 4e728f4bc..09ea44454 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -77,13 +77,13 @@ UniValue importprivkey(const UniValue& params, bool fHelp) { if (!EnsureWalletIsAvailable(fHelp)) return NullUniValue; - + if (fHelp || params.size() < 1 || params.size() > 3) throw runtime_error( - "importprivkey \"zcashprivkey\" ( \"label\" rescan )\n" + "importprivkey \"bitcoinzprivkey\" ( \"label\" rescan )\n" "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n" "\nArguments:\n" - "1. \"zcashprivkey\" (string, required) The private key (see dumpprivkey)\n" + "1. \"bitcoinzprivkey\" (string, required) The private key (see dumpprivkey)\n" "2. \"label\" (string, optional, default=\"\") An optional label\n" "3. rescan (boolean, optional, default=true) Rescan the wallet for transactions\n" "\nNote: This call can take minutes to complete if rescan is true.\n" @@ -298,7 +298,7 @@ UniValue importwallet_impl(const UniValue& params, bool fHelp, bool fImportZKeys if (vstr.size() < 2) continue; - // Let's see if the address is a valid Zcash spending key + // Let's see if the address is a valid BitcoinZ spending key if (fImportZKeys) { try { CZCSpendingKey spendingkey(vstr[0]); @@ -321,7 +321,7 @@ UniValue importwallet_impl(const UniValue& params, bool fHelp, bool fImportZKeys } catch (const std::runtime_error &e) { LogPrint("zrpc","Importing detected an error: %s\n", e.what()); - // Not a valid spending key, so carry on and see if it's a Zcash style address. + // Not a valid spending key, so carry on and see if it's a BitcoinZ style address. } } @@ -385,14 +385,14 @@ UniValue dumpprivkey(const UniValue& params, bool fHelp) { if (!EnsureWalletIsAvailable(fHelp)) return NullUniValue; - + if (fHelp || params.size() != 1) throw runtime_error( - "dumpprivkey \"zcashaddress\"\n" - "\nReveals the private key corresponding to 'zcashaddress'.\n" + "dumpprivkey \"bitcoinzaddress\"\n" + "\nReveals the private key corresponding to 'bitcoinzaddress'.\n" "Then the importprivkey can be used with this output\n" "\nArguments:\n" - "1. \"zcashaddress\" (string, required) The BitcoinZ address for the private key\n" + "1. \"bitcoinzaddress\" (string, required) The BitcoinZ address for the private key\n" "\nResult:\n" "\"key\" (string) The private key\n" "\nExamples:\n" @@ -424,13 +424,13 @@ UniValue z_exportwallet(const UniValue& params, bool fHelp) { if (!EnsureWalletIsAvailable(fHelp)) return NullUniValue; - + if (fHelp || params.size() != 1) throw runtime_error( "z_exportwallet \"filename\"\n" "\nExports all wallet keys, for taddr and zaddr, in a human-readable format. Overwriting an existing file is not permitted.\n" "\nArguments:\n" - "1. \"filename\" (string, required) The filename, saved in folder set by zcashd -exportdir option\n" + "1. \"filename\" (string, required) The filename, saved in folder set by bitcoinzd -exportdir option\n" "\nResult:\n" "\"path\" (string) The full path of the destination file\n" "\nExamples:\n" @@ -451,7 +451,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp) "dumpwallet \"filename\"\n" "\nDumps taddr wallet keys in a human-readable format. Overwriting an existing file is not permitted.\n" "\nArguments:\n" - "1. \"filename\" (string, required) The filename, saved in folder set by zcashd -exportdir option\n" + "1. \"filename\" (string, required) The filename, saved in folder set by bitcoinzd -exportdir option\n" "\nResult:\n" "\"path\" (string) The full path of the destination file\n" "\nExamples:\n" @@ -475,7 +475,7 @@ UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys) throw JSONRPCError(RPC_INTERNAL_ERROR, e.what()); } if (exportdir.empty()) { - throw JSONRPCError(RPC_WALLET_ERROR, "Cannot export wallet until the zcashd -exportdir option has been set"); + throw JSONRPCError(RPC_WALLET_ERROR, "Cannot export wallet until the bitcoinzd -exportdir option has been set"); } std::string unclean = params[0].get_str(); std::string clean = SanitizeFilename(unclean); diff --git a/zcutil/build-debian-package.sh b/zcutil/build-debian-package.sh index 071962520..0039fecfa 100755 --- a/zcutil/build-debian-package.sh +++ b/zcutil/build-debian-package.sh @@ -17,7 +17,7 @@ if [ ! -d $BUILD_PATH ]; then mkdir $BUILD_PATH fi -PACKAGE_VERSION=$($SRC_PATH/src/zcashd --version | grep version | cut -d' ' -f4 | tr -d v) +PACKAGE_VERSION=$($SRC_PATH/src/bitcoinzd --version | grep version | cut -d' ' -f4 | tr -d v) DEBVERSION=$(echo $PACKAGE_VERSION | sed 's/-beta/~beta/' | sed 's/-rc/~rc/' | sed 's/-/+/') BUILD_DIR="$BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-amd64" @@ -38,8 +38,8 @@ chmod 0755 -R $BUILD_DIR/* #cp $SRC_DEB/preinst $BUILD_DIR/DEBIAN #cp $SRC_DEB/prerm $BUILD_DIR/DEBIAN # Copy binaries -cp $SRC_PATH/src/zcashd $DEB_BIN -cp $SRC_PATH/src/zcash-cli $DEB_BIN +cp $SRC_PATH/src/bitcoinzd $DEB_BIN +cp $SRC_PATH/src/bitcoinz-cli $DEB_BIN cp $SRC_PATH/zcutil/fetch-params.sh $DEB_BIN/zcash-fetch-params # Copy docs cp $SRC_PATH/doc/release-notes/release-notes-1.0.3.md $DEB_DOC/changelog @@ -47,23 +47,23 @@ cp $SRC_DEB/changelog $DEB_DOC/changelog.Debian cp $SRC_DEB/copyright $DEB_DOC cp -r $SRC_DEB/examples $DEB_DOC # Copy manpages -cp $SRC_DOC/man/zcashd.1 $DEB_MAN -cp $SRC_DOC/man/zcash-cli.1 $DEB_MAN +cp $SRC_DOC/man/bitcoinzd.1 $DEB_MAN +cp $SRC_DOC/man/bitcoinz-cli.1 $DEB_MAN cp $SRC_DOC/man/zcash-fetch-params.1 $DEB_MAN # Copy bash completion files -cp $SRC_PATH/contrib/zcashd.bash-completion $DEB_CMP/zcashd -cp $SRC_PATH/contrib/zcash-cli.bash-completion $DEB_CMP/zcash-cli +cp $SRC_PATH/contrib/bitcoinzd.bash-completion $DEB_CMP/bitcoinzd +cp $SRC_PATH/contrib/bitcoinz-cli.bash-completion $DEB_CMP/bitcoinz-cli # Gzip files gzip --best -n $DEB_DOC/changelog gzip --best -n $DEB_DOC/changelog.Debian -gzip --best -n $DEB_MAN/zcashd.1 -gzip --best -n $DEB_MAN/zcash-cli.1 +gzip --best -n $DEB_MAN/bitcoinzd.1 +gzip --best -n $DEB_MAN/bitcoinz-cli.1 gzip --best -n $DEB_MAN/zcash-fetch-params.1 cd $SRC_PATH/contrib # Create the control file -dpkg-shlibdeps $DEB_BIN/zcashd $DEB_BIN/zcash-cli +dpkg-shlibdeps $DEB_BIN/bitcoinzd $DEB_BIN/bitcoinz-cli dpkg-gencontrol -P$BUILD_DIR -v$DEBVERSION # Create the Debian package diff --git a/zcutil/get-bitcoinz.sh b/zcutil/get-bitcoinz.sh index 07b99a0ee..26017995c 100755 --- a/zcutil/get-bitcoinz.sh +++ b/zcutil/get-bitcoinz.sh @@ -21,10 +21,10 @@ then mkdir -p ~/.bitcoinz fi -if ! [[ -f ~/.bitcoinz/bitcoinz.conf ]] +if ! [[ -f ~/.bitcoinz/bitcoinz.conf ]] then echo "rpcuser=rpc`pwgen 15 1`" > ~/.bitcoinz/bitcoinz.conf echo "rpcpassword=rpc`pwgen 15 1`" >> ~/.bitcoinz/bitcoinz.conf fi -./zcashd \ No newline at end of file +./bitcoinzd diff --git a/zcutil/setup-bitcoinz-service.sh b/zcutil/setup-bitcoinz-service.sh index 6b62e9a3b..2a89bbec2 100755 --- a/zcutil/setup-bitcoinz-service.sh +++ b/zcutil/setup-bitcoinz-service.sh @@ -22,7 +22,7 @@ then mkdir -p ~/.bitcoinz fi -if ! [[ -f ~/.bitcoinz/bitcoinz.conf ]] +if ! [[ -f ~/.bitcoinz/bitcoinz.conf ]] then echo "rpcuser=rpc`pwgen 15 1`" > ~/.bitcoinz/bitcoinz.conf echo "rpcpassword=rpc`pwgen 15 1`" >> ~/.bitcoinz/bitcoinz.conf @@ -38,7 +38,7 @@ cat > /etc/systemd/system/bitcoinz.service << EOF Description=bitcoinz [Service] -ExecStart=`cd ~; pwd`/bitcoinz-pkg/zcashd +ExecStart=`cd ~; pwd`/bitcoinz-pkg/bitcoinzd User=$1 Restart=always