From 371e1baeb1845008aa4479c6fa0b89497468d039 Mon Sep 17 00:00:00 2001 From: onryo Date: Thu, 27 Jan 2022 14:01:28 +0000 Subject: [PATCH 01/13] Update 'src/hush_utils.h' --- src/hush_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hush_utils.h b/src/hush_utils.h index 81030a268..d4d92bc1a 100644 --- a/src/hush_utils.h +++ b/src/hush_utils.h @@ -1810,7 +1810,7 @@ void hush_args(char *argv0) vector HUSH_nodes= {"node1.hush.is","node2.hush.is","node3.hush.is", "node4.hush.is","node5.hush.is","node6.hush.is", - "node7.hush.is","node8.hush.is","node1.hush.land", "node2.hush.land"}; + "node7.hush.is","node8.hush.is","node1.hush.land", "node2.hush.land", "node3.hush.land", "node4.hush.land", "node5.hush.land"}; vector more_nodes = mapMultiArgs["-addnode"]; if (more_nodes.size() > 0) { fprintf(stderr,"%s: Adding %lu more nodes via custom -addnode arguments\n", __func__, more_nodes.size() ); From bc3316165dd9c5ab96b8d2856fd2a6ca27ca1e8f Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 4 Feb 2022 14:55:44 +0000 Subject: [PATCH 02/13] Update 'INSTALL.md' --- INSTALL.md | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index eba94faa0..37e930058 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -26,11 +26,12 @@ sudo swapon /swapfile sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib \ autoconf libtool ncurses-dev unzip git python zlib1g-dev wget \ bsdmainutils automake curl unzip nano libsodium-dev -# pull +# clone git repo git clone https://git.hush.is/hush/hush3 cd hush3 # Build -./build.sh -j$(nproc) +# This uses 3 build processes, you need 2GB of RAM for each. +./build.sh -j3 ``` ### Building On Ubuntu 16.04 and older systems @@ -45,6 +46,23 @@ apt-get install -y gcc-7 g++-7 && \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 ``` +### Build on mac + +These instructions are a work in progress. Please report issues to https://hush.is/tg_support + +``` +sudo port update +sudo port upgrade outdated +sudo port install qt5 + +# clone git repo +git clone https://git.hush.is/hush/hush3 +cd hush3 +# Build +# This uses 3 build processes, you need 2GB of RAM for each. +./build.sh -j3 +``` + ## Run a HUSH Node After you have compiled Hush, then you can run it with the following command: From 32ea1efda4f8afd587734289f45b74c6ec518b1a Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 4 Feb 2022 14:59:39 +0000 Subject: [PATCH 03/13] Update 'INSTALL.md' --- INSTALL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 37e930058..114ef1775 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -98,5 +98,5 @@ Currently, any ARMv7 machine will not be able to build this repo, because the underlying tech (zcash and the zksnark library) do not support that instruction set. -This also means that RaspberryPi devices will not work, unless they have a -newer ARMv8-based Raspberry Pi. +This also means that old RaspberryPi devices will not work, unless they have a +newer ARMv8-based Raspberry Pi. Raspberry Pi 4 and newer are known to work. From 6154e216b2fb81b3691af12587b00e2ae3763836 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Sat, 5 Feb 2022 22:37:02 -0500 Subject: [PATCH 04/13] 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 05/13] 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 06/13] 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 c8430665f714db7aff020cc2fc3af61ecadca870 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Tue, 15 Feb 2022 11:26:50 -0500 Subject: [PATCH 07/13] WIP RPC that doesn't quite work yet --- src/rpc/blockchain.cpp | 36 +++++++++++++++++++++++++++++ src/rpc/client.cpp | 1 + src/zcash/IncrementalMerkleTree.hpp | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 5f3a54d2f..24412762a 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -856,6 +856,41 @@ UniValue gettxoutsetinfo(const UniValue& params, bool fHelp, const CPubKey& mypk return ret; } +UniValue getblockmerkletree(const UniValue& params, bool fHelp, const CPubKey& mypk) +{ + if (fHelp || params.size() != 1 ) + throw runtime_error( + "getblockmerkletree height\n" + "\nGet full merkletree for a given Hush or HSC block height.\n" + "\nArguments:\n" + "1. height (int, required) block height\n" + "\nResult:\n" + "\"hex\" (string) the merkle tree hex encoded\n" + + HelpExampleCli("getblockmerkletree", "290000") + + HelpExampleRpc("getblockmerkletree", "290000") + ); + + CBlockIndex* phushblockindex; + uint256 blockRoot; + SaplingMerkleTree tree; + + int nHeight = params[0].get_int(); + if ( (nHeight < 1) || (nHeight > chainActive.LastTip()->GetHeight()) ) { + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid Hush or HSC block height parameter"); + } + + phushblockindex = chainActive[nHeight]; + blockRoot = phushblockindex->pprev->hashFinalSaplingRoot; + if( pcoinsTip->GetSaplingAnchorAt(blockRoot, tree) ) { + CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); + ss << tree.path(); + std::vector merklepath(ss.begin(), ss.end()); + //TODO: this returns the same, wrong data for all heights + return HexStr(merklepath); + } else { + throw JSONRPCError(RPC_INVALID_PARAMETER, "Could not find merkletree"); + } +} UniValue kvsearch(const UniValue& params, bool fHelp, const CPubKey& mypk) { @@ -1877,6 +1912,7 @@ static const CRPCCommand commands[] = { "blockchain", "getblockcount", &getblockcount, true }, { "blockchain", "getblock", &getblock, true }, { "blockchain", "getblockhash", &getblockhash, true }, + { "blockchain", "getblockmerkletree", &getblockmerkletree, true }, { "blockchain", "getblockheader", &getblockheader, true }, { "blockchain", "getchaintips", &getchaintips, true }, { "blockchain", "getchaintxstats", &getchaintxstats, true }, diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 916273043..e427ec3ff 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -63,6 +63,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "getbalance", 1 }, { "getbalance", 2 }, { "getblockhash", 0 }, + { "getblockmerkletree", 0 }, { "move", 2 }, { "move", 3 }, { "sendfrom", 2 }, diff --git a/src/zcash/IncrementalMerkleTree.hpp b/src/zcash/IncrementalMerkleTree.hpp index 03fa51fda..e0a05f6c6 100644 --- a/src/zcash/IncrementalMerkleTree.hpp +++ b/src/zcash/IncrementalMerkleTree.hpp @@ -108,6 +108,7 @@ public: IncrementalWitness witness() const { return IncrementalWitness(*this); } + MerklePath path(std::deque filler_hashes = std::deque()) const; ADD_SERIALIZE_METHODS; @@ -135,7 +136,6 @@ private: // Collapsed "left" subtrees ordered toward the root of the tree. std::vector> parents; - MerklePath path(std::deque filler_hashes = std::deque()) const; Hash root(size_t depth, std::deque filler_hashes = std::deque()) const; bool is_complete(size_t depth = Depth) const; size_t next_depth(size_t skip) const; From ce5c8a54e458def4b698b95f810e088e1e508d7d Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Wed, 16 Feb 2022 09:10:11 -0500 Subject: [PATCH 08/13] Make it work correctly --- src/rpc/blockchain.cpp | 8 +++----- src/zcash/IncrementalMerkleTree.hpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 24412762a..90b8e7201 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -880,13 +880,11 @@ UniValue getblockmerkletree(const UniValue& params, bool fHelp, const CPubKey& m } phushblockindex = chainActive[nHeight]; - blockRoot = phushblockindex->pprev->hashFinalSaplingRoot; + blockRoot = phushblockindex->hashFinalSaplingRoot; if( pcoinsTip->GetSaplingAnchorAt(blockRoot, tree) ) { CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); - ss << tree.path(); - std::vector merklepath(ss.begin(), ss.end()); - //TODO: this returns the same, wrong data for all heights - return HexStr(merklepath); + ss << tree; + return HexStr(ss.begin(), ss.end()); } else { throw JSONRPCError(RPC_INVALID_PARAMETER, "Could not find merkletree"); } diff --git a/src/zcash/IncrementalMerkleTree.hpp b/src/zcash/IncrementalMerkleTree.hpp index e0a05f6c6..03fa51fda 100644 --- a/src/zcash/IncrementalMerkleTree.hpp +++ b/src/zcash/IncrementalMerkleTree.hpp @@ -108,7 +108,6 @@ public: IncrementalWitness witness() const { return IncrementalWitness(*this); } - MerklePath path(std::deque filler_hashes = std::deque()) const; ADD_SERIALIZE_METHODS; @@ -136,6 +135,7 @@ private: // Collapsed "left" subtrees ordered toward the root of the tree. std::vector> parents; + MerklePath path(std::deque filler_hashes = std::deque()) const; Hash root(size_t depth, std::deque filler_hashes = std::deque()) const; bool is_complete(size_t depth = Depth) const; size_t next_depth(size_t skip) const; From c3623047f7eba7b6bd63ea4a21f4f74ea27d71f5 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Wed, 16 Feb 2022 10:57:52 -0500 Subject: [PATCH 09/13] Script to generate SDL checkpoint data via getblockmerkletree --- contrib/sdl_checkpoints.pl | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 contrib/sdl_checkpoints.pl diff --git a/contrib/sdl_checkpoints.pl b/contrib/sdl_checkpoints.pl new file mode 100755 index 000000000..e140fb0ec --- /dev/null +++ b/contrib/sdl_checkpoints.pl @@ -0,0 +1,44 @@ +#!/usr/bin/perl +# 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 + +# This script is used to generate the data used by the silentdragonlite-cli checkpoints.rs file +# https://git.hush.is/hush/silentdragonlite-cli/src/branch/master/lib/src/lightclient/checkpoints.rs#L24 + +use warnings; +use strict; +my $hush = "./src/hush-cli"; +my $gethash = "$hush getblockhash"; +my $gettree = "$hush getblockmerkletree"; +my $start = shift || 300000; +my $end = shift || 840000; +my $stride = shift || 10000; + +my $blocks = qx{$hush getblockcount}; +if($?) { + print "ERROR, is hushd running? exiting...\n"; + exit 1; +} + +if ($end > $blocks) { + print "The block $end is beyond how many blocks this node knows about, exiting...\n"; + exit 1; +} + +if ($start < 1) { + print "Invalid start block $start, exiting...\n"; + exit 1; +} + +my $block = $start; +while (1) { + last if $block > $end; + my $blockhash = qx{$gethash $block}; + my $merkle = qx{$gettree $block}; + chomp $merkle; + chomp $blockhash; + print qq{($block,"$blockhash",\n\t"$merkle"\n),\n}; + + $block += $stride; +} From 04911ae966963b4240d23970f8d0e8de08cc28fb Mon Sep 17 00:00:00 2001 From: jahway603 Date: Fri, 18 Mar 2022 12:12:40 -0400 Subject: [PATCH 10/13] 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 11/13] 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")); From fab401343f1b0ccb4f83d81dac66a1e200abcd7a Mon Sep 17 00:00:00 2001 From: jahway603 Date: Fri, 18 Mar 2022 14:43:14 -0400 Subject: [PATCH 12/13] updated AUTHORS file --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index d2d49e2e0..20bd581e2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,6 +2,7 @@ Duke Leto https://git.hush.is/duke https://github.com/leto Miodrag https://github.com/miodragpop +jahway603 https://git.hush.is/jahway603 https://github.com/jahway603 # The SuperNET Developers From ccfd17b3b2f1a1e92f64a05fe351e7ee52218c35 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Sun, 27 Mar 2022 00:40:46 -0400 Subject: [PATCH 13/13] minor change --- src/hush/tlsmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hush/tlsmanager.cpp b/src/hush/tlsmanager.cpp index c0c280a42..51e2ea064 100644 --- a/src/hush/tlsmanager.cpp +++ b/src/hush/tlsmanager.cpp @@ -619,7 +619,7 @@ int TLSManager::threadSocketHandler(CNode* pnode, fd_set& fdsetRecv, fd_set& fds if (nRet != WOLFSSL_ERROR_WANT_READ && nRet != WOLFSSL_ERROR_WANT_WRITE) { if (!pnode->fDisconnect) - LogPrintf("TSL: ERROR: SSL_read %s\n", ERR_error_string(nRet, NULL)); + LogPrintf("TLS: ERROR: SSL_read %s\n", ERR_error_string(nRet, NULL)); pnode->CloseSocketDisconnect(); unsigned long error = ERR_get_error(); @@ -634,7 +634,7 @@ int TLSManager::threadSocketHandler(CNode* pnode, fd_set& fdsetRecv, fd_set& fds } else { if (nRet != WSAEWOULDBLOCK && nRet != WSAEMSGSIZE && nRet != WSAEINTR && nRet != WSAEINPROGRESS) { if (!pnode->fDisconnect) - LogPrintf("TSL: ERROR: socket recv %s\n", NetworkErrorString(nRet)); + LogPrintf("TLS: ERROR: socket recv %s\n", NetworkErrorString(nRet)); pnode->CloseSocketDisconnect(); } }