From 6154e216b2fb81b3691af12587b00e2ae3763836 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Sat, 5 Feb 2022 22:37:02 -0500 Subject: [PATCH 1/5] updated manpage copyright to 2022 --- doc/man/hush-cli.1 | 2 +- doc/man/hush-tx.1 | 2 +- doc/man/hushd.1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/man/hush-cli.1 b/doc/man/hush-cli.1 index 6179f7d95..35482a8fe 100644 --- a/doc/man/hush-cli.1 +++ b/doc/man/hush-cli.1 @@ -75,7 +75,7 @@ Read extra arguments from standard input, one per line until EOF/Ctrl\-D In order to ensure you are adequately protecting your privacy when using Hush, please see . -Copyright (C) 2016-2021 Duke Leto and The Hush Developers +Copyright (C) 2016-2022 Duke Leto and The Hush Developers Copyright (C) 2016-2020 jl777 and SuperNET developers Copyright (C) 2016-2018 The Zcash developers Copyright (C) 2009-2014 The Bitcoin Core developers diff --git a/doc/man/hush-tx.1 b/doc/man/hush-tx.1 index 54149df40..ec0004e1d 100644 --- a/doc/man/hush-tx.1 +++ b/doc/man/hush-tx.1 @@ -88,7 +88,7 @@ Set register NAME to given JSON\-STRING In order to ensure you are adequately protecting your privacy when using Hush, please see . -Copyright (C) 2016-2021 Duke Leto and The Hush Developers +Copyright (C) 2016-2022 Duke Leto and The Hush Developers Copyright (C) 2016-2020 jl777 and SuperNET developers Copyright (C) 2016-2018 The Zcash developers Copyright (C) 2009-2014 The Bitcoin Core developers diff --git a/doc/man/hushd.1 b/doc/man/hushd.1 index f5c1dd68e..73baab69f 100644 --- a/doc/man/hushd.1 +++ b/doc/man/hushd.1 @@ -712,7 +712,7 @@ Enforce transaction\-rate limit, default 0 In order to ensure you are adequately protecting your privacy when using Hush, please see . -Copyright (C) 2016-2021 Duke Leto and The Hush Developers +Copyright (C) 2016-2022 Duke Leto and The Hush Developers Copyright (C) 2016-2020 jl777 and SuperNET developers Copyright (C) 2016-2018 The Zcash developers Copyright (C) 2009-2014 The Bitcoin Core developers From 4e803c60552e0d65f1dae6091f141d1be6b36767 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Mon, 7 Feb 2022 00:49:02 -0500 Subject: [PATCH 2/5] reverted back to upstream --- doc/man/hush-cli.1 | 2 +- doc/man/hush-tx.1 | 2 +- doc/man/hushd.1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/man/hush-cli.1 b/doc/man/hush-cli.1 index 35482a8fe..6179f7d95 100644 --- a/doc/man/hush-cli.1 +++ b/doc/man/hush-cli.1 @@ -75,7 +75,7 @@ Read extra arguments from standard input, one per line until EOF/Ctrl\-D In order to ensure you are adequately protecting your privacy when using Hush, please see . -Copyright (C) 2016-2022 Duke Leto and The Hush Developers +Copyright (C) 2016-2021 Duke Leto and The Hush Developers Copyright (C) 2016-2020 jl777 and SuperNET developers Copyright (C) 2016-2018 The Zcash developers Copyright (C) 2009-2014 The Bitcoin Core developers diff --git a/doc/man/hush-tx.1 b/doc/man/hush-tx.1 index ec0004e1d..54149df40 100644 --- a/doc/man/hush-tx.1 +++ b/doc/man/hush-tx.1 @@ -88,7 +88,7 @@ Set register NAME to given JSON\-STRING In order to ensure you are adequately protecting your privacy when using Hush, please see . -Copyright (C) 2016-2022 Duke Leto and The Hush Developers +Copyright (C) 2016-2021 Duke Leto and The Hush Developers Copyright (C) 2016-2020 jl777 and SuperNET developers Copyright (C) 2016-2018 The Zcash developers Copyright (C) 2009-2014 The Bitcoin Core developers diff --git a/doc/man/hushd.1 b/doc/man/hushd.1 index 73baab69f..f5c1dd68e 100644 --- a/doc/man/hushd.1 +++ b/doc/man/hushd.1 @@ -712,7 +712,7 @@ Enforce transaction\-rate limit, default 0 In order to ensure you are adequately protecting your privacy when using Hush, please see . -Copyright (C) 2016-2022 Duke Leto and The Hush Developers +Copyright (C) 2016-2021 Duke Leto and The Hush Developers Copyright (C) 2016-2020 jl777 and SuperNET developers Copyright (C) 2016-2018 The Zcash developers Copyright (C) 2009-2014 The Bitcoin Core developers From 026c23ee208cb879b97ee76db42fc33a73e01728 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Mon, 7 Feb 2022 02:14:58 -0500 Subject: [PATCH 3/5] ARM deb creation script --- contrib/debian/control | 2 +- zcutil/build-debian-package-ARM.sh | 115 +++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) create mode 100755 zcutil/build-debian-package-ARM.sh diff --git a/contrib/debian/control b/contrib/debian/control index 4b542452a..8526dd6b4 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -11,6 +11,6 @@ Vcs-Git: https://git.hush.is/hush/hush3.git Vcs-Browser: https://git.hush.is/hush/hush3 Package: hush -Architecture: amd64 +Architecture: amd64 arm64 Depends: ${shlibs:Depends} Description: Hush cryptocoin full node. Speak And Transact Freely. Hush inherits from Bitcoin Protocol and Zcash Protocol and is focused on private communications. diff --git a/zcutil/build-debian-package-ARM.sh b/zcutil/build-debian-package-ARM.sh new file mode 100755 index 000000000..a2f9629cf --- /dev/null +++ b/zcutil/build-debian-package-ARM.sh @@ -0,0 +1,115 @@ +#!/usr/bin/env bash +# Copyright (c) 2016-2022 The Hush developers +# Distributed under the GPLv3 software license, see the accompanying +# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html +# +# Remix for SBC (Single Board Computer) like PineBook, Rock64, Raspberry Pi, etc. +## Usage: ./zcutil/build-debian-package-ARM.sh + +# Pre-requisite checks +# Check if lintian is installed and exit if it is not +if ! [ -x "$(command -v lintian)" ]; then + echo 'Error: lintian is not installed yet. Consult your Linux version package manager...' >&2 + echo 'On Debian/Ubuntu, try "sudo apt install lintian"' + echo "" + exit 1 +fi +# Check if fakeroot is installed and exit if it is not +if ! [ -x "$(command -v fakeroot)" ]; then + echo 'Error: fakeroot is not installed yet. Consult your Linux version package manager...' >&2 + echo 'On Debian/Ubuntu, try "sudo apt install fakeroot"' + echo "" + exit 1 +fi + +echo "Let There Be Hush Debian ARM Packages" +echo "" +echo " ______" +echo " |\_______________ (_____\\______________" +echo "HH======#H###############H#######################" +echo ' ~"""""""""""""""`##(_))#H\"""""Y########' +echo " )) \#H\ ##Y###" +echo 'dew " }#H)' +echo "" + +set -e +set -x + +BUILD_PATH="/tmp/hush-debian-$$" +PACKAGE_NAME="hush" +SRC_PATH=`pwd` +SRC_DEB=$SRC_PATH/contrib/debian +SRC_DOC=$SRC_PATH/doc +ARCH="aarch64" + +umask 022 + +if [ ! -d $BUILD_PATH ]; then + mkdir $BUILD_PATH +fi + +PACKAGE_VERSION=$($SRC_PATH/src/hushd --version|grep version|cut -d' ' -f4|cut -d- -f1|sed 's/v//g') +DEBVERSION=$(echo $PACKAGE_VERSION | sed 's/-beta/~beta/' | sed 's/-rc/~rc/' | sed 's/-/+/') +BUILD_DIR="$BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-$ARCH" + +if [ -d $BUILD_DIR ]; then + rm -R $BUILD_DIR +fi + +DEB_BIN=$BUILD_DIR/usr/bin +DEB_CMP=$BUILD_DIR/usr/share/bash-completion/completions +DEB_DOC=$BUILD_DIR/usr/share/doc/$PACKAGE_NAME +DEB_MAN=$BUILD_DIR/usr/share/man/man1 +DEB_SHR=$BUILD_DIR/usr/share/hush +mkdir -p $BUILD_DIR/DEBIAN $DEB_CMP $DEB_BIN $DEB_DOC $DEB_MAN $DEB_SHR +chmod 0755 -R $BUILD_DIR/* + +# Package maintainer scripts (currently empty) +#cp $SRC_DEB/postinst $BUILD_DIR/DEBIAN +#cp $SRC_DEB/postrm $BUILD_DIR/DEBIAN +#cp $SRC_DEB/preinst $BUILD_DIR/DEBIAN +#cp $SRC_DEB/prerm $BUILD_DIR/DEBIAN + +cp $SRC_PATH/contrib/asmap/asmap.dat $DEB_SHR +cp $SRC_PATH/sapling-spend.params $DEB_SHR +cp $SRC_PATH/sapling-output.params $DEB_SHR +cp $SRC_PATH/src/hushd $DEB_BIN +strip $DEB_BIN/hushd +cp $SRC_PATH/src/hush-cli $DEB_BIN +strip $DEB_BIN/hush-cli +cp $SRC_PATH/src/hush-tx $DEB_BIN +strip $DEB_BIN/hush-tx +cp $SRC_PATH/src/hush-smart-chain $DEB_BIN +#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/hushd.1 $DEB_MAN/hushd.1 +cp $SRC_DOC/man/hush-cli.1 $DEB_MAN/hush-cli.1 +cp $SRC_DOC/man/hush-tx.1 $DEB_MAN/hush-tx.1 + +# Copy bash completion files +cp $SRC_PATH/contrib/hushd.bash-completion $DEB_CMP/hushd +cp $SRC_PATH/contrib/hush-cli.bash-completion $DEB_CMP/hush-cli +cp $SRC_PATH/contrib/hush-tx.bash-completion $DEB_CMP/hush-tx +# Gzip files +#gzip --best -n $DEB_DOC/changelog +#gzip --best -n $DEB_DOC/changelog.Debian +gzip --best -n $DEB_MAN/hushd.1 +gzip --best -n $DEB_MAN/hush-cli.1 +gzip --best -n $DEB_MAN/hush-tx.1 + +cd $SRC_PATH/contrib + +# Create the control file +dpkg-shlibdeps $DEB_BIN/hushd $DEB_BIN/hush-cli $DEB_BIN/hush-tx +dpkg-gencontrol -P$BUILD_DIR -v$DEBVERSION +#dpkg-gencontrol -P$BUILD_DIR + +# Create the Debian package +fakeroot dpkg-deb --build $BUILD_DIR +cp $BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-$ARCH.deb $SRC_PATH +shasum -a 256 $SRC_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-$ARCH.deb +# Analyze with Lintian, reporting bugs and policy violations +lintian -i $SRC_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-$ARCH.deb +exit 0 From 04911ae966963b4240d23970f8d0e8de08cc28fb Mon Sep 17 00:00:00 2001 From: jahway603 Date: Fri, 18 Mar 2022 12:12:40 -0400 Subject: [PATCH 4/5] Mention z_viewtransaction in gettransaction and getrawtransaction RPC calls --- src/rpc/rawtransaction.cpp | 2 +- src/wallet/rpcwallet.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 69e614f3b..a48df8e44 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -353,7 +353,7 @@ UniValue getrawtransaction(const UniValue& params, bool fHelp, const CPubKey& my "\nNOTE: By default this function only works sometimes. This is when the tx is in the mempool\n" "or there is an unspent output in the utxo for this transaction. To make it always work,\n" "you need to maintain a transaction index, using the -txindex command line option.\n" - "\nReturn the raw transaction data.\n" + "\nReturn the raw transaction data. Also see z_viewtransaction for ztx details.\n" "\nIf verbose=0, returns a string that is serialized, hex-encoded data for 'txid'.\n" "If verbose is non-zero, returns an Object with information about 'txid'.\n" diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index e3f5e5064..c4dd9c7fc 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2257,7 +2257,7 @@ UniValue gettransaction(const UniValue& params, bool fHelp, const CPubKey& mypk) if (fHelp || params.size() < 1 || params.size() > 2) throw runtime_error( "gettransaction \"txid\" ( includeWatchonly )\n" - "\nGet detailed information about in-wallet transaction . Also see z_viewtransaction for ztx details\n" + "\nGet detailed information about in-wallet transaction . Also see z_viewtransaction for ztx details.\n" "\nArguments:\n" "1. \"txid\" (string, required) The transaction id\n" "2. \"includeWatchonly\" (bool, optional, default=false) Whether to include watchonly addresses in balance calculation and details[]\n" From 214a7418d7bcd8b9d725914323c50d65255c6745 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Fri, 18 Mar 2022 12:54:48 -0400 Subject: [PATCH 5/5] Document that '~' cannot be used in -datadir --- src/bitcoin-cli.cpp | 2 +- src/init.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index e9623f9bd..79e7701fc 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -48,7 +48,7 @@ std::string HelpMessageCli() strUsage += HelpMessageGroup(_("Options:")); strUsage += HelpMessageOpt("-?", _("This help message")); strUsage += HelpMessageOpt("-conf=", strprintf(_("Specify configuration file (default: %s)"), "HUSH3.conf")); - strUsage += HelpMessageOpt("-datadir=", _("Specify data directory")); + strUsage += HelpMessageOpt("-datadir=", _("Specify data directory (this path cannot use '~')")); strUsage += HelpMessageOpt("-testnet", _("Use the test network")); strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be " "solved instantly. This is intended for regression testing tools and app development.")); diff --git a/src/init.cpp b/src/init.cpp index 2aaa490a0..90cad3b02 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -389,7 +389,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-daemon", _("Run in the background as a daemon and accept commands")); #endif } - strUsage += HelpMessageOpt("-datadir=", _("Specify data directory")); + strUsage += HelpMessageOpt("-datadir=", _("Specify data directory (this path cannot use '~')")); strUsage += HelpMessageOpt("-exportdir=", _("Specify directory to be used when exporting data")); strUsage += HelpMessageOpt("-dbcache=", strprintf(_("Set database cache size in megabytes (%d to %d, default: %d)"), nMinDbCache, nMaxDbCache, nDefaultDbCache)); strUsage += HelpMessageOpt("-loadblock=", _("Imports blocks from external blk000??.dat file") + " " + _("on startup"));