Merge pull request 'Mention z_viewtransaction in gettransaction and getrawtransaction RPC calls AND Document that '~' cannot be used in -datadir' (#119) from jahway603/hush3:dev into dev

Reviewed-on: #119

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.

src/bitcoin-cli.cpp

@@ -48,7 +48,7 @@ std::string HelpMessageCli()
     strUsage += HelpMessageGroup(_("Options:"));
     strUsage += HelpMessageOpt("-?", _("This help message"));
     strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "HUSH3.conf"));
-    strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
+    strUsage += HelpMessageOpt("-datadir=<dir>", _("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."));

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=<dir>", _("Specify data directory"));
+    strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory (this path cannot use '~')"));
     strUsage += HelpMessageOpt("-exportdir=<dir>", _("Specify directory to be used when exporting data"));
     strUsage += HelpMessageOpt("-dbcache=<n>", strprintf(_("Set database cache size in megabytes (%d to %d, default: %d)"), nMinDbCache, nMaxDbCache, nDefaultDbCache));
     strUsage += HelpMessageOpt("-loadblock=<file>", _("Imports blocks from external blk000??.dat file") + " " + _("on startup"));

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"
 

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 <txid>. Also see z_viewtransaction for ztx details\n"
+            "\nGet detailed information about in-wallet transaction <txid>. 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"

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