Merge branch 'dev' into duke

.gitignore

@@ -31,7 +31,6 @@ libtool
 src/config/bitcoin-config.h
 src/config/bitcoin-config.h.in
 src/config/stamp-h1
-share/setup.nsi
 
 cache/
 venv-mnf/
@@ -109,14 +108,7 @@ contrib/debian/files
 contrib/debian/substvars
 
 src/rpcmisc~.cpp
-src/komodo-cli
-src/komodod
-src/komodo-tx
-src/komodo-test
 src/wallet-utility
-src/komodo-cli.exe
-src/komodod.exe
-src/komodo-tx.exe
 
 src/hush-cli
 src/hushd

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
 

CONTRIBUTING.md

@@ -37,7 +37,7 @@ Before we get started, here are a few things we expect from you (and that you sh
 
 ## How to contribute
 
-If you'd like to contribute, start by searching through the [issues](https://github.com/MyHush/hush3/issues) and [pull requests](https://github.com/MyHush/hush3/pulls) to see whether someone else has raised a similar idea or question.
+If you'd like to contribute, start by searching through the [issues](https://git.hush.is/hush/hush3/issues) and [pull requests](https://git.hush.is/hush/hush3/pulls) to see whether someone else has raised a similar idea or question.
 
 If you don't see your idea listed, and you think it can contribute to Hush, do one of the following:
 * **If your contribution is minor,** such as a fixing a typo, open a pull request.
@@ -49,7 +49,7 @@ Don't write shitty code. Do not emulate "jl777 code style" from Komodo, we consi
 
 ## Setting up your environment
 
-The Hush Core (hushd) is mainly written in C++ with specific modules written in C. Follow the [Install](https://github.com/MyHush/hush3/blob/master/INSTALL.md) instructions to build hushd from sources. For more informations about the Hush Platform and a full API documentation please visit the official [Hush Developer documentation](https://gilardh.github.io/dev-website/developers/)
+The Hush Core (hushd) is mainly written in C++ with specific modules written in C. Follow the [Install](https://git.hush.is/hush/hush3/src/branch/master/INSTALL.md) instructions to build hushd from sources. For more informations about the Hush Platform and a full API documentation please visit the official [Hush Developer documentation](https://faq.hush.is/rpc/)
 
 Other Hush software is written in Rust or Go. We avoid Javascript at all costs.
 

DEVELOPING.md

@@ -78,13 +78,13 @@ of a dependency or something inside of Rust, you will need `build.sh` .
 Make sure that you have updated all version numbers in hushd and compiled, then
 to generate new unix man pages for that version :
 
-	./contrib/devtools/gen-manpages.sh
+	./util/gen-manpages.sh
 
 ## Generating new debian packages
 
 After successfully compiling Hush, you can generate a debian package of these binaries with:
 
-	./zcutil/build-debian-package.sh
+	./util/build-debian-package.sh
 
 This command will not work on Mac OS X. Currently you cannot generate a Debian package
 from operating systems other than Linux. Oh well.

Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 FROM ubuntu:16.04
@@ -22,12 +22,11 @@ RUN cd /hush && \
     ./configure --with-incompatible-bdb --with-gui || true && \
     ./build.sh -j$(nproc)
 
-RUN ln -sf /hush/src/komodod /usr/bin/komodod && \
+RUN ln -sf /hush/src/hushd /usr/bin/hushd && \
-    ln -sf /hush/src/hushd /usr/bin/hushd && \
     ln -sf /hush/src/hush-tx /usr/bin/hush-tx && \
     ln -sf /hush/src/wallet-utility /usr/bin/hush-wallet-utility && \
     ln -sf /hush/src/hush-smart-chain /usr/bin/hush-smart-chain && \
-    ln -sf /hush/zcutil/docker-entrypoint.sh /usr/bin/entrypoint && \
+    ln -sf /hush/util/docker-entrypoint.sh /usr/bin/entrypoint && \
-    ln -sf /hush/zcutil/docker-hush-cli.sh /usr/bin/hush-cli
+    ln -sf /hush/util/docker-hush-cli.sh /usr/bin/hush-cli
 
 CMD ["entrypoint"]

INSTALL-BIN.md

@@ -0,0 +1,11 @@
+# Installing Hush binaries
+
+1. First [download the release](https://git.hush.is/hush/hush3/releases) you want to install. It will have a .deb file extension.
+
+1. Next install the Debian package (change the version to what you downloaded above):
+
+	`dpkg -i hush-3.8.0-amd64.deb`
+
+1. If you want to remove it, then run this to uninstall:
+
+	`apt-get remove hush`

INSTALL.md

@@ -1,14 +1,6 @@
 # Installing Hush
 
-## Installing Binaries
+Instructions to compile Hush yourself.
-
-To install a Debian package:
-
-	dpkg -i hush-3.6.2-amd4.deb
-
-To uninstall:
-
-	apt-get remove hush
 
 ## Build HUSH dependencies
 
@@ -29,20 +21,20 @@ sudo swapon /swapfile
 
 ## Build on Linux:
 
-
 ```sh
-# install build depedencies
+# install build dependencies
 sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib \
-      autoconf libtool ncurses-dev unzip git python zlib1g-dev wget \
+      autoconf libtool ncurses-dev unzip git zlib1g-dev wget \
-      bsdmainutils automake curl unzip nano libsodium-dev
+      bsdmainutils automake curl unzip nano libsodium-dev cmake
-# 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
+### Building On Ubuntu 16.04 and older systems
 
 Some older compilers may not be able to compile modern code, such as gcc 5.4 which comes with Ubuntu 16.04 by default. Here is how to install gcc 7 on Ubuntu 16.04. Run these commands as root:
 
@@ -54,8 +46,27 @@ 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:
+
 ```sh
 ./src/hushd
 ```
@@ -81,15 +92,11 @@ cd hush
 ./src/hushd
 ```
 
-Currently Linux,  Windows and Mac OS X are our supported platforms. If you
+## ARM Architecture
-are interested in porting Hush to a new operating system, we are interested
-to talk with you. Experimental FreeBSD support is in progress, thanks to radix42.
-
-We aim to support all platforms, but there is only so much time in the day.
 
 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
+This also means that old RaspberryPi devices will not work, unless they have a
-newer ARMv8-based Raspberry Pi.
+newer ARMv8-based Raspberry Pi. Raspberry Pi 4 and newer are known to work.

ISSUE_TEMPLATE.md

@@ -38,7 +38,7 @@ Run `hushd --version` to find out
 
 ### Any extra information that might be useful in the debugging process.
 
-This includes the relevant contents of `~/.komodo/HUSH3/debug.log`. You can paste raw text, attach the file directly in the issue or link to the text via a pastebin type site.
+This includes the relevant contents of `~/.hush/HUSH3/debug.log` or `~/.komodo/HUSH3/debug.log` if you have a legacy install. You can paste raw text, attach the file directly in the issue or link to the text via a pastebin type site.
 Please also include any non-standard things you did during compilation (extra flags, dependency version changes etc.) if applicable.
 
 Beware that usernames and IP addresses and other metadata is definitely in this log file!

Makefile.am

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 The Hush developers
+# Copyright 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
 
@@ -17,15 +17,15 @@ pkgconfig_DATA = libzcashconsensus.pc
 endif
 
 
-BITCOIND_BIN=$(top_builddir)/src/komodod$(EXEEXT)
+BITCOIND_BIN=$(top_builddir)/src/hushd$(EXEEXT)
-BITCOIN_CLI_BIN=$(top_builddir)/src/komodo-cli$(EXEEXT)
+BITCOIN_CLI_BIN=$(top_builddir)/src/hush-cli$(EXEEXT)
 #WALLET_UTILITY_BIN=$(top_builddir)/src/wallet-utility$(EXEEXT)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
 
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
 
-BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
+BIN_CHECKS=$(top_srcdir)/util/symbol-check.py \
-	$(top_srcdir)/contrib/devtools/security-check.py
+	$(top_srcdir)/util/security-check.py
 
 
 
@@ -233,7 +233,7 @@ endif
 endif
 
 dist_bin_SCRIPTS = 
-dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh
+dist_noinst_SCRIPTS = autogen.sh util/build-debian-package.sh util/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/hush $(DIST_DOCS) $(BIN_CHECKS)
 
@@ -247,4 +247,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-man
 clean-local:
 	rm -rf test_bitcoin.coverage/ total.coverage/
 
+manpages:
+	./util/gen-manpages.sh
+	@echo "Please review the man pages changes to see if they look correct, then commit and push"
+
 # I also heard about a bug in the UNIVAC but it's too big for this comment. -- Duke

OLD_WALLETS.md

@@ -24,11 +24,14 @@ or this command line tool: https://git.hush.is/hush/hush3/src/master/contrib/con
 
 ### Using an old wallet.dat
 
-Backup your old HUSH wallet.dat, and backup any current wallet.dat that is in your
+Backup your old HUSH wallet.dat, and backup any current wallet.dat that is in
 
         ~/.komodo/HUSH3/
 
-directory. There is no way to lose funds, as long as you have backups!!! Make sure
+OR
+        ~/.hush/HUSH3/
+
+There is no way to lose funds, as long as you have backups!!! Make sure
 to make backups. Do not skip this step.
 
 Make sure any/all GUI wallets are stopped! Also make sure your old Hush node
@@ -42,12 +45,12 @@ corrupt your wallet!
 
 Now copy your old Hush wallet.dat to
 
-        ~/.komodo/HUSH3/
+        ~/.hush/HUSH3/
 
 with a command like
 
         # DO NOT RUN THIS WITHOUT MAKING BACKUPS!
-        cp ~/.hush/wallet.dat ~/.komodo/HUSH3/
+        cp ~/.hush/wallet.dat ~/.hush/HUSH3/
 
 The reason this works is that both old HUSH and new HUSH are still Bitcoin Protocol
 coins, which both use secp256k1 public keys. Now start your HUSH3 node again,

README.md

@@ -22,7 +22,7 @@ coin takes over 24 hours to sync their full nodes because of Sprout Transactions
 In working on this release, Duke Leto was suspended from Github, which gave Hush developers
 the impetus to completely leave that racist and censorship-loving platform.
 
-Hush now has it's own <a href="https://git.hush.is/hush">git.hush.is</a> Gitea instance,
+Hush now has it's own [git.hush.is](https://git.hush.is/hush) Gitea instance,
 because we will not be silenced by Microsoft.
 
 All Hush software will be released from git.hush.is and hush.is, downloads from any other
@@ -32,7 +32,11 @@ domains should be assumed to be backdoored.
 
 ## Installing
 
-See [INSTALL.md](https://git.hush.is/hush/hush3/src/branch/master/INSTALL.md)
+You can either compile it yourself or you can install a binary which was compiled by us.
+Please refer to the instructions which apply to you below:
+
+* See [INSTALL.md](INSTALL.md) to compile from source on Linux and to cross-compile for Windows
+* See [INSTALL-BIN.md](INSTALL-BIN.md) to install pre-compiled binary on Linux
 
 ### Claiming Funds From Old Hush Wallets
 
@@ -40,11 +44,16 @@ If you have an older wallet, then refer to [OLD_WALLETS.md](OLD_WALLETS.md).
 
 ### Official Explorer
 
-The link for the Official Hush explorer is: <a href="https://explorer.hush.is">explorer.hush.is</a>
+The link for the Official Hush explorer is: [explorer.hush.is](https://explorer.hush.is)
 
 We are looking for alternate explorers to be run on Tor, i2P and other TLDs, if you are interested
 please join Telegram and ask questions.
 
+### For system admins
+
+There is a new systemd user service script so you can easily start/stop/restart your hushd service on your server.
+[Try it out today](doc/hushd-systemd.md) and the systemd script is located in the doc directory of the source tree.
+
 ## Support and Socials
 
 Please feel free to join us on Telegram for official support:
@@ -53,9 +62,11 @@ Please feel free to join us on Telegram for official support:
 * Mining group: https://hush.is/telegram_mining
 
 Other socials:
-* Toot us <a href="https://hush.is/twitter">@MyHushTeam</a> on Twitter
+* Twitter: <a href="https://hush.is/twitter">@hushisprivacy</a>
-* Follow <a href="https://hush.is/yt">Hush</a> on YouTube
+* Matrix: <a href="https://hush.is/matrix">@hush_main:meowchat.xyz</a>
-* Join <a href="https://hush.is/reddit">Hush</a> on Reddit
+* PeerTube <a href="https://hush.is/peertube">videos.hush.is</a>
+* Reddit <a href="https://hush.is/reddit">@Myhush</a>
+* Mastodon <a href="https://hush.is/mastodon">@myhushteam@fosstodon.org</a>
 
 ## License
 

autogen.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 set -e

build.sh

@@ -1,7 +1,19 @@
-#!/bin/bash
+#!/usr/bin/env bash
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 
 set -eu -o pipefail
-./zcutil/build.sh --disable-tests $@
+
+# run correct build script for detected OS
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    ./util/build.sh --disable-tests $@
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    ./util/build-mac.sh --disable-tests $@
+elif [[ "$OSTYPE" == "msys"* ]]; then
+    ./util/build-win.sh --disable-tests $@
+#elif [[ "$OSTYPE" == "freebsd"* ]]; then
+    # placeholder
+else
+    echo "Unable to detect your OS. What are you using?"
+fi

configure.ac

@@ -1,13 +1,13 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
-define(_CLIENT_VERSION_MINOR, 8)
+define(_CLIENT_VERSION_MINOR, 9)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 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, 2021)
+define(_COPYRIGHT_YEAR, 2022)
 AC_INIT([Hush],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://git.hush.is/hush/hush3],[hush])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
@@ -151,12 +151,6 @@ AC_ARG_ENABLE([glibc-back-compat],
   [use_glibc_compat=$enableval],
   [use_glibc_compat=no])
 
-AC_ARG_ENABLE([zmq],
-  [AS_HELP_STRING([--disable-zmq],
-  [disable ZMQ notifications])],
-  [use_zmq=$enableval],
-  [use_zmq=yes])
-
 AC_ARG_ENABLE([experimental-asm],
   [AS_HELP_STRING([--enable-experimental-asm],
   [Enable experimental assembly routines (default is no)])],
@@ -673,15 +667,6 @@ if test x$use_pkgconfig = xyes; then
         fi
       fi
 
-      if test "x$use_zmq" = "xyes"; then
-        PKG_CHECK_MODULES([ZMQ],[libzmq >= 4],
-          [AC_DEFINE([ENABLE_ZMQ],[1],[Define to 1 to enable ZMQ functions])],
-          [AC_DEFINE([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions])
-           AC_MSG_WARN([libzmq version 4.x or greater not found, disabling])
-           use_zmq=no])
-      else
-          AC_DEFINE_UNQUOTED([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions])
-      fi
     ]
   )
 else
@@ -718,34 +703,13 @@ fi
 #AC_CHECK_HEADER([gmpxx.h],,AC_MSG_ERROR(libgmpxx headers missing))
 #AC_CHECK_LIB([gmpxx],[main],GMPXX_LIBS=-lgmpxx, [AC_MSG_ERROR(libgmpxx missing)])
 
-  if test "x$use_zmq" = "xyes"; then
-     AC_CHECK_HEADER([zmq.h],
-       [AC_DEFINE([ENABLE_ZMQ],[1],[Define to 1 to enable ZMQ functions])],
-       [AC_MSG_WARN([zmq.h not found, disabling zmq support])
-        use_zmq=no
-        AC_DEFINE([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions])])
-     AC_CHECK_LIB([zmq],[zmq_ctx_shutdown],ZMQ_LIBS=-lzmq,
-       [AC_MSG_WARN([libzmq >= 4.0 not found, disabling zmq support])
-        use_zmq=no
-        AC_DEFINE([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions])])
-  else
-    AC_DEFINE_UNQUOTED([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions])
-  fi
 
-  if test "x$use_zmq" = "xyes"; then
-    dnl Assume libzmq was built for static linking
-    case $host in
-      *mingw*)
-        ZMQ_CFLAGS="$ZMQ_CFLAGS -DZMQ_STATIC"
-      ;;
-    esac
-  fi
 fi
 
 # These packages don't provide pkgconfig config files across all
 # platforms, so we use older autoconf detection mechanisms:
 AC_CHECK_HEADER([gmp.h],,AC_MSG_ERROR(libgmp headers missing))
-AC_CHECK_LIB([gmp],[[__gmpn_sub_n]],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])
+#AC_CHECK_LIB([gmp],[[__gmpn_sub_n]],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])
 
 AC_CHECK_HEADER([gmpxx.h],,AC_MSG_ERROR(libgmpxx headers missing))
 AC_CHECK_LIB([gmpxx],[main],GMPXX_LIBS=-lgmpxx, [AC_MSG_ERROR(libgmpxx missing)])
@@ -824,8 +788,6 @@ else
   AC_MSG_RESULT(no)
 fi
 
-AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"])
-
 AC_MSG_CHECKING([whether to build test_bitcoin])
 if test x$use_tests = xyes; then
   AC_MSG_RESULT([yes])
@@ -894,7 +856,6 @@ AC_SUBST(CRYPTO_LIBS)
 AC_SUBST(SSL_LIBS)
 AC_SUBST(EVENT_LIBS)
 AC_SUBST(EVENT_PTHREADS_LIBS)
-AC_SUBST(ZMQ_LIBS)
 AC_SUBST(GMP_LIBS)
 AC_SUBST(GMPXX_LIBS)
 AC_SUBST(LIBZCASH_LIBS)
@@ -944,7 +905,6 @@ esac
 echo 
 echo "Options used to compile and link:"
 echo "  with wallet   = $enable_wallet"
-echo "  with zmq      = $use_zmq"
 echo "  with test     = $use_tests"
 echo "  debug enabled = $enable_debug"
 echo "  werror        = $enable_werror"

contrib/README.md

@@ -6,10 +6,25 @@ Do not expect all scripts to work!
 
 Please fix bugs and report things you find.
 
-## Hush Tools
+# Hush Tools
+
+## block\_time.pl
+
+Estimate when a Hush block will happen.
+
+Example:
+
+    ./contrib/block_time.pl  123456 # Print out datetime of when block height 123456 happens
+
+## gen-zaddrs.pl
+
+Generate zaddrs in bulk, by default 50 at a time. Prints out a zaddr one per line.
+
+Example:
+
+    ./contrib/gen-zaddrs.pl     # generate 50 zaddrs
+    ./contrib/gen-zaddrs.pl 500 # generate 500 zaddrs
 
-checkpoints.pl - generate checkpoint data for main.cpp
-block\_time.pl - estimate when a Hush block will happen
 
 ## Wallet Tools
 

contrib/block_time.pl

@@ -1,5 +1,5 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 use warnings;
@@ -8,6 +8,9 @@ use strict;
 # Given a block time, estimate when it will happen
 my $block      = shift || die "Usage: $0 123";
 my $hush       = "./src/hush-cli";
+unless (-e $hush) {
+    die "$hush does not exist, aborting";
+}
 my $blockcount = qx{$hush getblockcount};
 
 unless ($blockcount = int($blockcount)) {
@@ -19,7 +22,7 @@ if ($block <= $blockcount) {
 	die "That block has already happened!";
 } else {
 	my $diff    = $block - $blockcount;
-	my $minutes = $diff*2.5;
+	my $minutes = $diff*1.25; # 75s in minutes
 	my $seconds = $minutes*60;
 	my $now     = time;
 	my $then    = $now + $seconds;

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.

contrib/debian/copyright

@@ -2,7 +2,7 @@ Files: *
 Copyright: 2016-2020, The Hush developers
  2009-2016, Bitcoin Core developers
 License: GPLv3
-Comment: https://hush.is/developers
+Comment: https://hush.is
 
 Files: depends/sources/libsodium-*.tar.gz
 Copyright: 2013-2016 Frank Denis
@@ -23,19 +23,6 @@ Copyright: 1990, 2016 Oracle and/or its affiliates;
  2000-2005 INRIA, France Telecom
 License: BDB
 
-Files: depends/sources/zeromq-*.tar.gz
-Copyright:
- 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
- 2007-2014 iMatix Corporation
- 2009-2011 250bpm s.r.o.
- 2010-2011 Miru Limited
- 2011 VMware, Inc.
- 2012 Spotify AB
- 2013 Ericsson AB
- 2014 AppDynamics Inc.
- 2015-2016 Brocade Communications Systems Inc.
-License: LGPL-with-ZeroMQ-exception
-
 Files: depends/sources/google*.tar.gz
 Copyright: 2008 Google Inc.
 License: BSD-3clause-Google
@@ -1056,35 +1043,6 @@ Comment:
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-License: LGPL-with-ZeroMQ-exception
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
- .
- On Debian systems the GNU Lesser General Public License (LGPL) is
- located in '/usr/share/common-licenses/LGPL'.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- --------------------------------------------------------------------------------
- SPECIAL EXCEPTION GRANTED BY COPYRIGHT HOLDERS
- .
- As a special exception, copyright holders give you permission to link this
- library with independent modules to produce an executable, regardless of
- the license terms of these independent modules, and to copy and distribute
- the resulting executable under terms of your choice, provided that you also
- meet, for each linked independent module, the terms and conditions of
- the license of that module. An independent module is a module which is not
- derived from or based on this library. If you modify this library, you must
- extend this exception to your version of the library.
-  
- Note: this exception relieves you of any obligations under sections 4 and 5
- of this license, and section 6 of the GNU General Public License.
-Comment:
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 License: GNU-All-permissive-License
  Copying and distribution of this file, with or without modification, are
  permitted in any medium without royalty provided the copyright notice

contrib/debian/hush.install

@@ -1,2 +1,3 @@
-usr/bin/komodod
+usr/bin/hushd
-usr/bin/komodo-cli
+usr/bin/hush-cli
+usr/bin/hush-tx

contrib/devtools/README.md

@@ -1,42 +0,0 @@
-# Contrib Devtools
-
-This directory contains tools for developers working on this repository.
-
-## security-check.py
-
-Perform basic ELF security checks on a series of executables.
-
-## symbol-check.py
-
-A script to check that the (Linux) executables produced by gitian only contain
-allowed gcc, glibc and libstdc++ version symbols.  This makes sure they are
-still compatible with the minimum supported Linux distribution versions.
-
-Example usage after a gitian build:
-
-    find ../gitian-builder/build -type f -executable | xargs python contrib/devtools/symbol-check.py 
-
-If only supported symbols are used the return value will be 0 and the output will be empty.
-
-If there are 'unsupported' symbols, the return value will be 1 a list like this will be printed:
-
-    .../64/test_bitcoin: symbol memcpy from unsupported version GLIBC_2.14
-    .../64/test_bitcoin: symbol __fdelt_chk from unsupported version GLIBC_2.15
-    .../64/test_bitcoin: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15
-    .../64/test_bitcoin: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15
-
-## update-translations.py
-
-Run this script from the root of the repository to update all translations from transifex.
-It will do the following automatically:
-
-- fetch all translations
-- post-process them into valid and committable format
-- add missing translations to the build system (TODO)
-
-See doc/translation-process.md for more information.
-
-## gen-manpages.sh
-
-A small script to automatically create manpages in ../../doc/man by running the release binaries with the -help option.
-This requires help2man which can be found at: https://www.gnu.org/software/help2man/

contrib/devtools/optimize-pngs.py

@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-import subprocess
-import hashlib
-from PIL import Image
-
-def file_hash(filename):
-    '''Return hash of raw file contents'''
-    with open(filename, 'rb') as f:
-        return hashlib.sha256(f.read()).hexdigest()
-
-def content_hash(filename):
-    '''Return hash of RGBA contents of image'''
-    i = Image.open(filename)
-    i = i.convert('RGBA')
-    data = i.tostring()
-    return hashlib.sha256(data).hexdigest()
-
-#optimize png, remove various color profiles, remove ancillary chunks (alla) and text chunks (text)
-#pngcrush -brute -ow -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem alla -rem text
-
-pngcrush = 'pngcrush'
-git = 'git'
-folders = ["src/qt/res/movies", "src/qt/res/icons", "src/qt/res/images"]
-basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel']).rstrip('\n')
-totalSaveBytes = 0
-
-outputArray = []
-for folder in folders:
-    absFolder=os.path.join(basePath, folder)
-    for file in os.listdir(absFolder):
-        extension = os.path.splitext(file)[1]
-        if extension.lower() == '.png':
-            print("optimizing "+file+"..."),
-            file_path = os.path.join(absFolder, file)
-            fileMetaMap = {'file' : file, 'osize': os.path.getsize(file_path), 'sha256Old' : file_hash(file_path)};
-            fileMetaMap['contentHashPre'] = content_hash(file_path)
-        
-            pngCrushOutput = ""
-            try:
-                pngCrushOutput = subprocess.check_output(
-                        [pngcrush, "-brute", "-ow", "-rem", "gAMA", "-rem", "cHRM", "-rem", "iCCP", "-rem", "sRGB", "-rem", "alla", "-rem", "text", file_path],
-                        stderr=subprocess.STDOUT).rstrip('\n')
-            except:
-                print "pngcrush is not installed, aborting..."
-                sys.exit(0)
-        
-            #verify
-            if "Not a PNG file" in subprocess.check_output([pngcrush, "-n", "-v", file_path], stderr=subprocess.STDOUT):
-                print "PNG file "+file+" is corrupted after crushing, check out pngcursh version"
-                sys.exit(1)
-            
-            fileMetaMap['sha256New'] = file_hash(file_path)
-            fileMetaMap['contentHashPost'] = content_hash(file_path)
-
-            if fileMetaMap['contentHashPre'] != fileMetaMap['contentHashPost']:
-                print "Image contents of PNG file "+file+" before and after crushing don't match"
-                sys.exit(1)
-
-            fileMetaMap['psize'] = os.path.getsize(file_path)
-            outputArray.append(fileMetaMap)
-            print("done\n"),
-
-print "summary:\n+++++++++++++++++"
-for fileDict in outputArray:
-    oldHash = fileDict['sha256Old']
-    newHash = fileDict['sha256New']
-    totalSaveBytes += fileDict['osize'] - fileDict['psize']
-    print fileDict['file']+"\n  size diff from: "+str(fileDict['osize'])+" to: "+str(fileDict['psize'])+"\n  old sha256: "+oldHash+"\n  new sha256: "+newHash+"\n"
-    
-print "completed. Total reduction: "+str(totalSaveBytes)+" bytes"

contrib/fresh_clone_compile_and_run.sh

@@ -1,19 +1,28 @@
-#!/bin/bash
+#!/usr/bin/env bash
-# Copyright (c) 2016-2021 The Hush developers
+# 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
-# OPEN BOUNTY
+
-# Send your CPU and RAM and time it takes to sync a HUSH full node for
+# Usage: $0 BRANCH JOBS
-# 5 HUSH as thanks for decentralized performance testing
+# TODO: default to master branch with 2 jobs
+
+# we don't want this for our build.sh and make commands
+#set -eu -o pipefail
+
+BRANCH=$1
+
 git clone https://git.hush.is/hush/hush3
 cd hush3
-# Build with 2 cores
+git checkout $BRANCH
 # You need 2GB of RAM per core, don't use too many
 # (GB of RAM)/2 - 1 is the optimal core count for compiling Hush
 # `nproc` tells you how many cores you have
-JOBS=2
+JOBS=$2
+JOBZ=$(nproc) # if build.sh fails, we can use many more jobs with make
 # Want to fix this parrallel-only build system bug we inherited ? you are a new hush dev
-./build.sh -j$JOBS;make -j$JOBS;make -j$JOBS;make -j$JOBS
+# Sometimes the parrallel build fails because of a race condition, so
+# we do it a few times to Make Really Sure
+./build.sh -j$JOBS;make -j$JOBZ;make -j$JOBZ;make -j$JOBZ
 ./src/hushd &> hush.log &
 # You can give the entire or parts of this file to Hush developers for debugging,
 # but there is a lot of metadata!!! We don't want any more than we need to fix bugz

contrib/gen-zaddrs.pl

@@ -0,0 +1,17 @@
+#!/usr/bin/env perl
+# Copyright 2019-2022 The Hush developers
+# Released under the GPLv3
+use warnings;
+use strict;
+
+my $hush    = "./src/hush-cli";
+my $znew    = "$hush z_getnewaddress";
+my $count   = 1;
+my $howmany = shift || 50;
+
+while ($count < $howmany) {
+    my $zaddr   = qx{$znew};
+    chomp($zaddr);
+    print qq{$zaddr\n};
+    $count++;
+}

contrib/gitian-descriptors/gitian-linux.yml

@@ -53,7 +53,7 @@ script: |
 
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
-    echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
+    echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
     echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
     echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
@@ -65,7 +65,7 @@ script: |
   function create_per-host_faketime_wrappers {
   for i in $HOSTS; do
     for prog in ${FAKETIME_HOST_PROGS}; do
-        echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
+        echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
         echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}

contrib/gitian-descriptors/gitian-osx-signer.yml

@@ -20,7 +20,7 @@ script: |
 
   # Create global faketime wrappers
   for prog in ${FAKETIME_PROGS}; do
-    echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
+    echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
     echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
     echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${prog}

contrib/gitian-descriptors/gitian-osx.yml

@@ -48,7 +48,7 @@ script: |
 
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
-    echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
+    echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
     echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
     echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
@@ -60,7 +60,7 @@ script: |
   function create_per-host_faketime_wrappers {
   for i in $HOSTS; do
     for prog in ${FAKETIME_HOST_PROGS}; do
-        echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
+        echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
         echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}

contrib/gitian-descriptors/gitian-win.yml

@@ -47,7 +47,7 @@ script: |
 
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
-    echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
+    echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
     echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
     echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
@@ -59,7 +59,7 @@ script: |
   function create_per-host_faketime_wrappers {
   for i in $HOSTS; do
     for prog in ${FAKETIME_HOST_PROGS}; do
-        echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
+        echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
         echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
@@ -75,14 +75,14 @@ script: |
   for i in $HOSTS; do
     mkdir -p ${WRAP_DIR}/${i}
     for prog in collect2; do
-        echo '#!/bin/bash' > ${WRAP_DIR}/${i}/${prog}
+        echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}/${prog}
         REAL=$(${i}-gcc -print-prog-name=${prog})
         echo "export MALLOC_PERTURB_=255" >> ${WRAP_DIR}/${i}/${prog}
         echo "${REAL} \$@" >> $WRAP_DIR/${i}/${prog}
         chmod +x ${WRAP_DIR}/${i}/${prog}
     done
     for prog in gcc g++; do
-        echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
+        echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
         echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}

contrib/hush_halvings

@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Released under the GPLv3
 
 use strict;

contrib/hush_scanner

@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 use strict;

contrib/hush_supply

@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Released under the GPLv3
 use warnings;
 use strict;

contrib/init/hushd.init

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 #  hushd The hush core server.
 #

contrib/macdeploy/sd-macdeploy.command

@@ -0,0 +1,136 @@
+#!/bin/bash
+
+# by Andy Maloney
+# http://asmaloney.com/2013/07/howto/packaging-a-mac-os-x-application-using-a-dmg/
+
+# make sure we are in the correct dir when we double-click a .command file
+dir=${0%/*}
+if [ -d "$dir" ]; then
+  cd "$dir"
+fi
+
+# set up your app name, version number, and background image file name
+APP_NAME="SilentDragon"
+VERSION="1.3.0"
+DMG_BACKGROUND_IMG="SDBackground.png"
+
+# you should not need to change these
+APP_EXE="${APP_NAME}.app/Contents/MacOS/${APP_NAME}"
+
+VOL_NAME="${APP_NAME} ${VERSION}"   # volume name will be "SilentDragon 1.3.0"
+DMG_TMP="${VOL_NAME}-temp.dmg"
+DMG_FINAL="${VOL_NAME}.dmg"         # final DMG name will be "SilentDragon 1.3.0.dmg"
+STAGING_DIR="./Install"             # we copy all our stuff into this dir
+
+# Check the background image DPI and convert it if it isn't 72x72
+_BACKGROUND_IMAGE_DPI_H=`sips -g dpiHeight ${DMG_BACKGROUND_IMG} | grep -Eo '[0-9]+\.[0-9]+'`
+_BACKGROUND_IMAGE_DPI_W=`sips -g dpiWidth ${DMG_BACKGROUND_IMG} | grep -Eo '[0-9]+\.[0-9]+'`
+
+if [ $(echo " $_BACKGROUND_IMAGE_DPI_H != 72.0 " | bc) -eq 1 -o $(echo " $_BACKGROUND_IMAGE_DPI_W != 72.0 " | bc) -eq 1 ]; then
+   echo "WARNING: The background image's DPI is not 72.  This will result in distorted backgrounds on Mac OS X 10.7+."
+   echo "         I will convert it to 72 DPI for you."
+   
+   _DMG_BACKGROUND_TMP="${DMG_BACKGROUND_IMG%.*}"_dpifix."${DMG_BACKGROUND_IMG##*.}"
+
+   sips -s dpiWidth 72 -s dpiHeight 72 ${DMG_BACKGROUND_IMG} --out ${_DMG_BACKGROUND_TMP}
+   
+   DMG_BACKGROUND_IMG="${_DMG_BACKGROUND_TMP}"
+fi
+
+# clear out any old data
+rm -rf "${STAGING_DIR}" "${DMG_TMP}" "${DMG_FINAL}"
+
+# copy over the stuff we want in the final disk image to our staging dir
+mkdir -p "${STAGING_DIR}"
+cp -rpf "${APP_NAME}.app" "${STAGING_DIR}"
+# ... cp anything else you want in the DMG - documentation, etc.
+
+pushd "${STAGING_DIR}"
+
+# strip the executable
+echo "Stripping ${APP_EXE}..."
+strip -u -r "${APP_EXE}"
+
+# compress the executable if we have upx in PATH
+#  UPX: http://upx.sourceforge.net/
+if hash upx 2>/dev/null; then
+   echo "Compressing (UPX) ${APP_EXE}..."
+   upx -9 "${APP_EXE}"
+fi
+
+# ... perform any other stripping/compressing of libs and executables
+
+popd
+
+# figure out how big our DMG needs to be
+#  assumes our contents are at least 1M!
+SIZE=`du -sh "${STAGING_DIR}" | sed 's/\([0-9\.]*\)M\(.*\)/\1/'` 
+SIZE=`echo "${SIZE} + 1.0" | bc | awk '{print int($1+0.5)}'`
+
+if [ $? -ne 0 ]; then
+   echo "Error: Cannot compute size of staging dir"
+   exit
+fi
+
+# create the temp DMG file
+hdiutil create -srcfolder "${STAGING_DIR}" -volname "${VOL_NAME}" -fs HFS+ \
+      -fsargs "-c c=64,a=16,e=16" -format UDRW -size ${SIZE}M "${DMG_TMP}"
+
+echo "Created DMG: ${DMG_TMP}"
+
+# mount it and save the device
+DEVICE=$(hdiutil attach -readwrite -noverify "${DMG_TMP}" | \
+         egrep '^/dev/' | sed 1q | awk '{print $1}')
+
+sleep 2
+
+# add a link to the Applications dir
+echo "Add link to /Applications"
+pushd /Volumes/"${VOL_NAME}"
+ln -s /Applications
+popd
+
+# add a background image
+mkdir /Volumes/"${VOL_NAME}"/.background
+cp "${DMG_BACKGROUND_IMG}" /Volumes/"${VOL_NAME}"/.background/
+
+# tell the Finder to resize the window, set the background,
+#  change the icon size, place the icons in the right position, etc.
+echo '
+   tell application "Finder"
+     tell disk "'${VOL_NAME}'"
+           open
+           set current view of container window to icon view
+           set toolbar visible of container window to false
+           set statusbar visible of container window to false
+           set the bounds of container window to {400, 100, 920, 440}
+           set viewOptions to the icon view options of container window
+           set arrangement of viewOptions to not arranged
+           set icon size of viewOptions to 72
+           set background picture of viewOptions to file ".background:'${DMG_BACKGROUND_IMG}'"
+           set position of item "'${APP_NAME}'.app" of container window to {160, 205}
+           set position of item "Applications" of container window to {360, 205}
+           close
+           open
+           update without registering applications
+           delay 2
+     end tell
+   end tell
+' | osascript
+
+sync
+
+# unmount it
+hdiutil detach "${DEVICE}"
+
+# now make the final image a compressed disk image
+echo "Creating compressed image"
+hdiutil convert "${DMG_TMP}" -format UDZO -imagekey zlib-level=9 -o "${DMG_FINAL}"
+
+# clean up
+rm -rf "${DMG_TMP}"
+rm -rf "${STAGING_DIR}"
+
+echo 'Done.'
+
+exit

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;
+}

contrib/tidy_datadir.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright (c) 2018-2020 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

contrib/verify-commits/gpg.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 INPUT=$(</dev/stdin)

contrib/verify-commits/pre-push-hook.sh

@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 if ! [[ "$2" =~ [git@]?[www.]?hush.is[:|/]bitcoin/bitcoin[.git]? ]]; then

contrib/verify-commits/verify-commits.sh

@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 

contrib/verifysfbinaries/verify.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ###   This script attempts to download the signature file SHA256SUMS.asc from bitcoin.org
 ###   It first checks if the signature passes, and then downloads the files specified in

contrib/zmq/zmq_sub.py

@@ -1,45 +0,0 @@
-#!/usr/bin/env python2
-# Copyright (c) 2014-2016 The Bitcoin Core developers
-# Copyright (c) 2016-2021 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
-
-import array
-import binascii
-import zmq
-import struct
-
-port = 28332
-
-zmqContext = zmq.Context()
-zmqSubSocket = zmqContext.socket(zmq.SUB)
-zmqSubSocket.setsockopt(zmq.SUBSCRIBE, "hashblock")
-zmqSubSocket.setsockopt(zmq.SUBSCRIBE, "hashtx")
-zmqSubSocket.setsockopt(zmq.SUBSCRIBE, "rawblock")
-zmqSubSocket.setsockopt(zmq.SUBSCRIBE, "rawtx")
-zmqSubSocket.connect("tcp://127.0.0.1:%i" % port)
-
-try:
-    while True:
-        msg = zmqSubSocket.recv_multipart()
-        topic = str(msg[0])
-        body = msg[1]
-        sequence = "Unknown";
-        if len(msg[-1]) == 4:
-          msgSequence = struct.unpack('<I', msg[-1])[-1]
-          sequence = str(msgSequence)
-        if topic == "hashblock":
-            print '- HASH BLOCK ('+sequence+') -'
-            print binascii.hexlify(body)
-        elif topic == "hashtx":
-            print '- HASH TX  ('+sequence+') -'
-            print binascii.hexlify(body)
-        elif topic == "rawblock":
-            print '- RAW BLOCK HEADER ('+sequence+') -'
-            print binascii.hexlify(body[:80])
-        elif topic == "rawtx":
-            print '- RAW TX ('+sequence+') -'
-            print binascii.hexlify(body)
-
-except KeyboardInterrupt:
-    zmqContext.destroy()

depends/Makefile

@@ -39,6 +39,7 @@ build_vendor=$(word 2,$(subst -, ,$(build)))
 full_build_os:=$(subst $(build_arch)-$(build_vendor)-,,$(build))
 build_os:=$(findstring linux,$(full_build_os))
 build_os+=$(findstring darwin,$(full_build_os))
+build_os+=$(findstring freebsd,$(full_build_os))
 build_os:=$(strip $(build_os))
 ifeq ($(build_os),)
 build_os=$(full_build_os)
@@ -49,6 +50,7 @@ host_vendor=$(word 2,$(subst -, ,$(canonical_host)))
 full_host_os:=$(subst $(host_arch)-$(host_vendor)-,,$(canonical_host))
 host_os:=$(findstring linux,$(full_host_os))
 host_os+=$(findstring darwin,$(full_host_os))
+host_os+=$(findstring freebsd,$(full_host_os))
 host_os+=$(findstring mingw32,$(full_host_os))
 host_os:=$(strip $(host_os))
 ifeq ($(host_os),)

depends/builders/freebsd.mk

@@ -0,0 +1,4 @@
+build_freebsd_CC = clang
+build_freebsd_CXX = clang++
+build_freebsd_SHA256SUM = shasum -a 256
+build_freebsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o

depends/funcs.mk

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 define int_vars

depends/hosts/darwin.mk

@@ -8,7 +8,7 @@ darwin_CXX=g++-8 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysro
 darwin_CFLAGS=-pipe
 darwin_CXXFLAGS=$(darwin_CFLAGS)
 
-darwin_release_CFLAGS=-O3
+darwin_release_CFLAGS=-O1
 darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)
 
 darwin_debug_CFLAGS=-O1

depends/hosts/freebsd.mk

@@ -0,0 +1,31 @@
+freebsd_CFLAGS=-pipe
+freebsd_CXXFLAGS=$(freebsd_CFLAGS)
+
+freebsd_release_CFLAGS=-O1
+freebsd_release_CXXFLAGS=$(freebsd_release_CFLAGS)
+
+freebsd_debug_CFLAGS=-O1
+freebsd_debug_CXXFLAGS=$(freebsd_debug_CFLAGS)
+
+freebsd_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
+
+ifeq (86,$(findstring 86,$(build_arch)))
+i686_freebsd_CC=gcc -m32
+i686_freebsd_CXX=g++ -m32
+i686_freebsd_AR=ar
+i686_freebsd_RANLIB=ranlib
+i686_freebsd_NM=nm
+i686_freebsd_STRIP=strip
+
+x86_64_freebsd_CC=gcc -m64
+x86_64_freebsd_CXX=g++ -m64
+x86_64_freebsd_AR=ar
+x86_64_freebsd_RANLIB=ranlib
+x86_64_freebsd_NM=nm
+x86_64_freebsd_STRIP=strip
+else
+i686_freebsd_CC=$(default_host_CC) -m32
+i686_freebsd_CXX=$(default_host_CXX) -m32
+x86_64_freebsd_CC=$(default_host_CC) -m64
+x86_64_freebsd_CXX=$(default_host_CXX) -m64
+endif

depends/packages/boost.mk

@@ -1,7 +1,7 @@
 package=boost
 
 $(package)_version=1_72_0
-$(package)_download_path=https://github.com/MyHush/boost/releases/download/v1.72.0/
+$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/
 $(package)_sha256_hash=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
 

depends/packages/libgmp.mk

@@ -9,16 +9,15 @@ $(package)_git_commit=42ba95387cdfd67399f7aac52fddb8d6e1258ee6
 $(package)_dependencies=
 $(package)_config_opts=--enable-cxx --disable-shared
 else ifeq ($(build_os),darwin)
-$(package)_download_path=https://git.hush.is/duke/$(package)/archive
+$(package)_version=6.1.1
-$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
+$(package)_download_path=https://git.hush.is/attachments
-$(package)_download_file=$($(package)_git_commit).tar.gz
+$(package)_file_name=d613c855-cd92-4efb-b893-658496852019
-$(package)_sha256_hash=59b2c2b5d58fdf5943bfde1fa709e9eb53e7e072c9699d28dc1c2cbb3c8cc32c
+$(package)_download_file=d613c855-cd92-4efb-b893-658496852019
-$(package)_git_commit=aece03c7b6967f91f3efdac8c673f55adff53ab1
+$(package)_sha256_hash=a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6
-$(package)_dependencies=
 $(package)_config_opts=--enable-cxx --disable-shared
 else
 $(package)_version=6.1.1
-$(package)_download_path=https://github.com/MyHush/libgmp/releases/download/v6.1.1
+$(package)_download_path=https://ftp.gnu.org/gnu/gmp
 $(package)_file_name=gmp-$($(package)_version).tar.bz2
 $(package)_sha256_hash=a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6
 $(package)_dependencies=

depends/packages/libsodium.mk

@@ -1,7 +1,8 @@
 package=libsodium
 $(package)_version=1.0.18
-$(package)_download_path=https://github.com/MyHush/libsodium/releases/download/$($(package)_version)/
+$(package)_download_path=https://git.hush.is/attachments
-$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_file_name=0d9f589e-a9f9-4ddb-acaa-0f1b423b32eb
+$(package)_download_file=0d9f589e-a9f9-4ddb-acaa-0f1b423b32eb
 $(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
 $(package)_dependencies=
 $(package)_config_opts=

depends/packages/packages.mk

@@ -39,7 +39,7 @@ native_packages := native_ccache
 wallet_packages=bdb
 
 ifeq ($(host_os),linux)
-	packages := boost wolfssl libevent zeromq $(zcash_packages) googletest libcurl #googlemock
+	packages := boost wolfssl libevent $(zcash_packages) googletest libcurl #googlemock
 else
 	packages := boost wolfssl libevent  $(zcash_packages) libcurl googletest #googlemock
 endif

depends/packages/utfcpp.mk

@@ -1,7 +1,7 @@
 $(package)_version=3.1
-$(package)_download_path=https://github.com/MyHush/$(package)/archive/
+$(package)_download_path=https://git.hush.is/attachments
-$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_file_name=11822fe4-3846-4ce4-9c84-ba0877a7b186
-$(package)_download_file=v$($(package)_version).tar.gz
+$(package)_download_file=11822fe4-3846-4ce4-9c84-ba0877a7b186
 $(package)_sha256_hash=ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096
 
 define $(package)_stage_cmds

depends/packages/zeromq.mk

@@ -1,53 +0,0 @@
-# Unsupported until further notice
-ifeq ($(host_os),mingw32)
-$(package)_version=4.3.1
-$(package)_download_path=https://git.hush.is/duke/libzmq/archive
-$(package)_download_file=v$($(package)_version).tar.gz
-$(package)_file_name=libzmq-$($(package)_version).tar.gz
-$(package)_sha256_hash=cb8ebe5b60dadeb526745610d6237f05a98aba287114d8991dad1fa14f4be354
-
-define $(package)_set_vars
-  $(package)_build_env+=
-  $(package)_config_opts=--enable-shared=false --enable-static --host=x86_64-w64-mingw32
-  $(package)_config_opts_mingw32=--enable-shared=false --enable-static --prefix=$(host_prefix) --host=x86_64-w64-mingw32 -disable-curve
-  $(package)_cflags=-Wno-error -Wall -Wno-pedantic-ms-format -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lws2_32 -liphlpapi -lrpcrt4
-  $(package)_conf_tool=./configure
-endef
-else
-package=zeromq
-$(package)_version=4.3.1
-$(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)
-$(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
-
-define $(package)_set_vars
-  $(package)_config_opts=--without-documentation --disable-shared --disable-curve
-  $(package)_config_opts_linux=--with-pic
-  $(package)_cxxflags=-std=c++11
-endef
-endif
-
-ifeq ($(host_os),mingw32)
-define $(package)_preprocess_cmds
-  cd $($(package)_build_subdir); ./autogen.sh
-endef
-define $(package)_config_cmds
-  $($(package)_conf_tool) $($(package)_config_opts) CFLAGS="-Wno-error -Wall -Wno-pedantic-ms-format -DLIBCZMQ_EXPORTS -DZMQ_DEFINED_STDINT -lws2_32 -liphlpapi -lrpcrt4"
-endef
-else
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-endif
-
-define $(package)_build_cmds
-  $(MAKE) src/libzmq.la
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install-libLTLIBRARIES install-includeHEADERS install-pkgconfigDATA
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf bin share
-endef

doc/beefy-HUSH3.conf

@@ -3,10 +3,5 @@ rpcpassword=dontuseweakpasswordoryougetrobbed
 txindex=1
 server=1
 rpcworkqueue=64
-addnode=5.9.102.210
+addnode=1.2.3.4
-addnode=78.47.196.146
+addnode=5.6.7.8
-addnode=178.63.69.164
-addnode=88.198.65.74
-addnode=5.9.122.241
-addnode=144.76.94.38
-addnode=89.248.166.91

doc/config.md

@@ -0,0 +1,59 @@
+# HUSH3.conf config options
+
+This document explains all options that can be used in HUSH3.conf
+
+# Basics
+
+Options can either be put in HUSH3.conf or given on the `hushd` commandline when starting. If you think you will want to continually use a feature, it's better to put it in HUSH3.conf. If you don't, and start `hushd` without an option on accident, it can cause downtime from a long rescan, that you didn't want to do anyway.
+
+
+## Common Options
+
+## addnode=1.2.3.4
+
+Tells your node to connect to another node, by IP address or hostname.
+
+## consolidation=1
+
+Defaults to 0 in CLI hushd, defaults to 1 in SilentDragon. This option consolidates many unspent shielded UTXOs (zutxos) into one zutxo, which makes spending them in the future faster and potentially cost less in fees. It also helps prevent
+certain kinds of metadata leakages and spam attacks. It is not recommended for very large wallets (wallet.dat files with thousands of transactions) for performance reasons. This is why it defaults to OFF for CLI full nodes but ON for GUI wallets that use an embedded hushd.
+
+## rescan=1
+
+Defaults to 0. Performs a full rescan of all of chain history. Can take a very long time. Speed this up with `rescanheight=123` to only rescan from a certain block height. Also speed this up with `keepnotewitnesscache=1` to not rebuild the zaddr witness cache.
+
+## rpcuser=hushpuppy
+
+No default. This option sets the RPC username and should only be used in HUSH3.conf, because setting it from the command-line makes it show up in `ps` output.
+
+## rpcpassword=TOOMANYSECRETS
+
+No default. This option sets the RPC password and should only be used in HUSH3.conf, because setting it from the command-line makes it show up in `ps` output.
+
+## txindex=1
+
+Defaults to 1. This is a default option that should not be changed or things will not work correctly.
+
+## zindex=1
+
+Defaults to 0. This option enables the "shielded index" which also calculates the "anonset" (anonymity set) also known as the "shielded pool". This data is avaailable in the getchaintxstats RPC, if zindex is enabled. Enabling this feature requires a full rescan or full sync from scratch, which is not done by default. If you don't do one of those things, your zindex stats will be incorrect.
+
+# Mining options
+
+These options are only of interest to solo miners and mining pool operators....
+
+# Other options
+
+These options are not commonly used and likely on for advanced users and/or developers...
+
+## addressindex=1
+
+Defaults to 0 in hushd, defaults to 1 in some GUI wallets. Maintain a full address index, used to query for the balance, txids and unspent outputs for addresses
+
+## timestampindex=1
+
+Defaults to 0 in hushd, defaults to 1 in some GUI wallets. Maintain a timestamp index for block hashes, used to query blocks hashes by a range of timestamps 
+
+## spentindex=1
+
+Defaults to 0 in hushd, defaults to 1 in some GUI wallets. Maintain a full spent index, used to query the spending txid and input index for an outpoint 

doc/developer-notes.md

@@ -9,18 +9,43 @@ A fresh sync preserves peers.dat, so it will always be faster than a "fresh clon
 One way to do a fresh sync is:
 
 ```
-cd ~/.komodo/HUSH3
+cd ~/.hush/HUSH3
 rm blocks chainstate database notarizations hushstate
 ```
 
+NOTE: The legacy directory is ~/.komodo/HUSH3 and hushd will use data from either, or ~/.hush/HUSH3 if both exist.
+
 If you are using `zindex=1` then you need to also delete zindex.dat
 
 ```
-cd ~/.komodo/HUSH3
+cd ~/.hush/HUSH3
 rm zindex.dat blocks chainstate database notarizations hushstate
 ```
 
-It's possible to confused hush if you ran old code, stop, restart, and then write out zindex.dat that is incorrect, with later hushds will load from disk and believe.
+It's possible to confused hush if you ran old code, stop, restart, and then write out zindex.dat that is incorrect, which later hushds will load from disk and believe.
+
+# Parsing RPC output with jq
+
+jq is a very useful tool to parse JSON output, install it with:
+
+    apt install jq
+
+Let's say you want to parse a very large output from `listunspent` which has spendable and
+unspendable funds mixed together. This can happen when you import a viewing key. Funds from
+the address of a viewing key will have `spendable = false` :
+
+
+    hush-cli listunspent|jq '.[] | {spendable, address, amount} | select(.spendable != false)'
+
+The above command will only show spendable UTXOs. The jq language is very powerful and is very
+useful for devops and developer scripts.
+
+The jq manual can be found here: https://stedolan.github.io/jq/manual/
+
+
+# Making a new release of Hush
+
+See doc/release-process.md for details.
 
 
 # Testing a Branch
@@ -37,17 +62,17 @@ git checkout zindexdb
 
 # we want to test a fresh sync, so backup current data
 TIME=`perl -e "print time"`
-mv ~/.komodo/{HUSH3,HUSH3-backup-$TIME}
+mv ~/.hush/{HUSH3,HUSH3-backup-$TIME}
-mkdir ~/.komodo/HUSH3
+mkdir ~/.hush/HUSH3
 
 # Use your previous config as a base
-cp ~/.komodo/{HUSH3-backup-$TIME,HUSH3}/HUSH3.conf
+cp ~/.hush/{HUSH3-backup-$TIME,HUSH3}/HUSH3.conf
 # Add zindex to your node
-echo "zindex=1" >> ~/.komodo/HUSH3/HUSH3.conf
+echo "zindex=1" >> ~/.hush/HUSH3/HUSH3.conf
 
 
 # This is optional but will likely speed up sync time greatly
-cp ~/.komodo/{HUSH3-backup,HUSH3}/peers.dat
+cp ~/.hush/{HUSH3-backup,HUSH3}/peers.dat
 
 # This log file is helpful for debugging more and will contain a history of the
 # size of the anonset at every block height
@@ -77,7 +102,7 @@ These values should match on all nodes:
 We should also check a recent block height to verify it's working correctly. The big "test" for this `zindexdb` branch is: 
 
   * If you stop a node, and restart, are the stats from `getchaintxtstats` correct, i.e. the anonset stats? For instance, `shielded_pool_size` should be close to 500000, if it's close to or exactly 0, something is wrong.
-  * Is there a new file called `zindex.dat` in `~/.komodo/HUSH3/` ? 
+  * Is there a new file called `zindex.dat` in `~/.hush/HUSH3/` ? 
   * Is `zindex.dat` 149 bytes ?
   
 # Coding
@@ -135,8 +160,9 @@ on all categories (and give you a very large debug.log file).
 
 **testnet and regtest modes**
 
-Run with the -testnet option to run with "play zcash" on the test network, if you
+Run with the -testnet option to run with "play HUSH" on the test network, if you
-are testing multi-machine code that needs to operate across the internet.
+are testing multi-machine code that needs to operate across the internet. You can
+also make a Hush Smart Chain "testcoin" with a single command: `hushd -ac_name=COIN ...`
 
 If you are testing something that can run on one machine, run with the -regtest option.
 In regression test mode, blocks can be created on-demand; see qa/rpc-tests/ for tests

doc/files.md

@@ -12,5 +12,6 @@
 * 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
+* zindex.dat: Optional file that stores anonset (shielded pool) stats. Only created if `zindex=1` in HUSH3.conf or `hushd -zindex` is used
 * .cookie: session RPC authentication cookie (written at start when cookie authentication is used, deleted on shutdown): since 0.12.0
 * onion_private_key: cached Tor hidden service private key for `-listenonion`: since 0.12.0

doc/hsc.md

@@ -0,0 +1,24 @@
+# Hush Smart Chains
+
+An overview of HSCs can be found here:
+
+https://git.hush.is/hush/hush-smart-chains
+
+Hush Smart Chains allow you to create a privacy coin with no custom C++ code, just running one command!
+The new coin that is created can use either Equihash PoW (ASIC or GPU) or RandomX PoW (CPU).
+
+## HSC Creator
+
+https://git.hush.is/hush/hsc-creator with its site https://hush.is/hsc-creator
+
+## HSC HOWTO
+
+https://git.hush.is/onryo/hush-smart-chain-how-to
+
+## HSC CLI
+
+https://git.hush.is/jahway603/hsc-cli
+
+## RandomX for HSCs
+
+Detailed docs on how to use RandomX Proof-of-Work is here: https://git.hush.is/hush/hush3/src/branch/dev/doc/randomx.md

doc/hushd-systemd.md

@@ -0,0 +1,35 @@
+# Systemd script for the Hush daemon
+
+## Set it up
+
+First set it up as follows:
+* Copy hushd.service to the systemd user directory, which is /usr/lib/systemd/user directory
+
+## Basic Usage
+
+How to start the script:
+`systemctl start --user hushd.service`
+
+How to stop the script:
+`systemctl stop --user hushd.service`
+
+How to restart the script:
+`systemctl restart --user hushd.service`
+
+## How to watch it as it starts
+
+Use the following on most Linux distros:
+`watch systemctl status --user hushd.service`
+
+If you're using Ubuntu 20.04, then try this instead as the above did not work for me on Ubuntu 20.04 server:
+`tail -f ~/.hush/HUSH3/debug.log`
+
+## Troubleshooting
+
+* Don't run it with sudo or root, or it won't work with the wallet.
+
+### To-do
+
+* Determine why Ubuntu 20.04 didn't produce the expected outcome with watch and systemctl
+* Create the hushd rc.d script
+* Create the hushd runit script

doc/hushd.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=Hush daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/hushd
+
+[Install]
+WantedBy=default.target

doc/man/Makefile.am

@@ -1 +1 @@
-dist_man1_MANS=komodod.1 komodo-cli.1 komodo-tx.1
+dist_man1_MANS=hushd.1 hush-cli.1 hush-tx.1

doc/man/hush-cli.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH HUSH-CLI "1" "July 2021" "hush-cli v3.8.0" "User Commands"
+.TH HUSH-CLI "1" "September 2022" "hush-cli v3.9.2" "User Commands"
 .SH NAME
-hush-cli \- manual page for hush-cli v3.8.0
+hush-cli \- manual page for hush-cli v3.9.2
 .SH DESCRIPTION
-Hush RPC client version v3.8.0\-10a6706e7\-dirty
+Hush RPC client version v3.9.2\-54cfe1099
 .PP
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://hush.is/security/>.
@@ -25,11 +25,11 @@ This help message
 .HP
 \fB\-conf=\fR<file>
 .IP
-Specify configuration file (default: komodo.conf)
+Specify configuration file (default: HUSH3.conf)
 .HP
 \fB\-datadir=\fR<dir>
 .IP
-Specify data directory
+Specify data directory (this path cannot use '~')
 .HP
 \fB\-testnet\fR
 .IP
@@ -47,7 +47,7 @@ Send commands to node running on <ip> (default: 127.0.0.1)
 .HP
 \fB\-rpcport=\fR<port>
 .IP
-Connect to JSON\-RPC on <port> (default: 8232 or testnet: 18232)
+Connect to JSON\-RPC on <port> (default: 18030 )
 .HP
 \fB\-rpcwait\fR
 .IP
@@ -75,9 +75,12 @@ 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 <https://hush.is/security/>.
 
-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
 
 This is experimental Free Software! Fuck Yeah!!!!!

doc/man/hush-tx.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH HUSH-TX "1" "July 2021" "hush-tx v3.8.0" "User Commands"
+.TH HUSH-TX "1" "September 2022" "hush-tx v3.9.2" "User Commands"
 .SH NAME
-hush-tx \- manual page for hush-tx v3.8.0
+hush-tx \- manual page for hush-tx v3.9.2
 .SH DESCRIPTION
-hush\-tx utility version v3.8.0\-10a6706e7\-dirty
+hush\-tx utility version v3.9.2\-54cfe1099
 .SS "Usage:"
 .TP
 hush\-tx [options] <hex\-tx> [commands]
@@ -88,9 +88,12 @@ Set register NAME to given JSON\-STRING
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://hush.is/security/>.
 
-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
 
 This is experimental Free Software! Fuck Yeah!!!!!

doc/man/hushd.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH HUSHD "1" "July 2021" "hushd v3.8.0" "User Commands"
+.TH HUSHD "1" "September 2022" "hushd v3.9.2" "User Commands"
 .SH NAME
-hushd \- manual page for hushd v3.8.0
+hushd \- manual page for hushd v3.9.2
 .SH DESCRIPTION
-Hush Daemon version v3.8.0\-10a6706e7\-dirty
+Hush Daemon version v3.9.2\-54cfe1099
 .PP
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://hush.is/security/>.
@@ -49,7 +49,7 @@ Run in the background as a daemon and accept commands
 .HP
 \fB\-datadir=\fR<dir>
 .IP
-Specify data directory
+Specify data directory (this path cannot use '~')
 .HP
 \fB\-exportdir=\fR<dir>
 .IP
@@ -69,9 +69,8 @@ Keep at most <n> unconnectable transactions in memory (default: 100)
 .HP
 \fB\-mempooltxinputlimit=\fR<n>
 .IP
-[DEPRECATED FROM OVERWINTER] Set the maximum number of transparent
+[DEPRECATED/IGNORED] Set the maximum number of transparent inputs in a
-inputs in a transaction that the mempool will accept (default: 0 = no
+transaction that the mempool will accept (default: 0 = no limit applied)
-limit applied)
 .HP
 \fB\-par=\fR<n>
 .IP
@@ -117,7 +116,7 @@ is replaced by transaction hex)
 \fB\-addressindex\fR
 .IP
 Maintain a full address index, used to query for the balance, txids and
-unspent outputs for addresses (default: 1)
+unspent outputs for addresses (default: 0)
 .HP
 \fB\-timestampindex\fR
 .IP
@@ -127,7 +126,7 @@ by a range of timestamps (default: 0)
 \fB\-spentindex\fR
 .IP
 Maintain a full spent index, used to query the spending txid and input
-index for an outpoint (default: 1)
+index for an outpoint (default: 0)
 .HP
 \fB\-zindex\fR
 .IP
@@ -142,7 +141,7 @@ Add a node to connect to and attempt to keep the connection open
 .HP
 \fB\-asmap=\fR<file>
 .IP
-Specify asn mapping used for bucketing of the peers (default:
+Specify ASN mapping used for bucketing of the peers (default:
 asmap.dat). Relative paths will be prefixed by the net\-specific datadir
 location.
 .HP
@@ -315,6 +314,35 @@ Specify Sapling Address to Consolidate. (default: all)
 Fee amount in Puposhis used send consolidation transactions. (default
 10000)
 .HP
+\fB\-zsweep\fR
+.IP
+Enable zaddr sweeping, automatically move all shielded funds to a one
+address once per X blocks
+.HP
+\fB\-zsweepaddress=\fR<zaddr>
+.IP
+Specify the shielded address where swept funds will be sent)
+.HP
+\fB\-zsweepfee\fR
+.IP
+Fee amount in puposhis used send sweep transactions. (default 10000)
+.HP
+\fB\-zsweepinterval\fR
+.IP
+Sweep shielded funds every X blocks (default 5)
+.HP
+\fB\-zsweepmaxinputs\fR
+.IP
+Maximum number of shielded inputs to sweep per transaction (default 8)
+.HP
+\fB\-zsweepexternal\fR
+.IP
+Enable sweeping to an external wallet (default false)
+.HP
+\fB\-zsweepexclude\fR
+.IP
+Addresses to exclude from sweeping (default none)
+.HP
 \fB\-deletetx\fR
 .IP
 Enable Old Transaction Deletion
@@ -415,24 +443,6 @@ Delete all wallet transactions and only recover those parts of the
 blockchain through \fB\-rescan\fR on startup (1 = keep tx meta data e.g.
 account owner and payment request information, 2 = drop tx meta data)
 .PP
-ZeroMQ notification options:
-.HP
-\fB\-zmqpubhashblock=\fR<address>
-.IP
-Enable publish hash block in <address>
-.HP
-\fB\-zmqpubhashtx=\fR<address>
-.IP
-Enable publish hash transaction in <address>
-.HP
-\fB\-zmqpubrawblock=\fR<address>
-.IP
-Enable publish raw block in <address>
-.HP
-\fB\-zmqpubrawtx=\fR<address>
-.IP
-Enable publish raw transaction in <address>
-.PP
 Debugging/Testing options:
 .HP
 \fB\-debug=\fR<category>
@@ -441,8 +451,8 @@ Output debugging information (default: 0, supplying <category> is
 optional). If <category> is not supplied or if <category> = 1, output
 all debugging information. <category> can be: addrman, alert, bench,
 coindb, db, deletetx, estimatefee, http, libevent, lock, mempool, net,
-tls, partitioncheck, pow, proxy, prune, rand, reindex, rpc, selectcoins,
+tls, partitioncheck, pow, proxy, prune, rand, randomx, reindex, rpc,
-tor, zmq, zrpc, zrpcunsafe (implies zrpc).
+selectcoins, stratum, tor, zrpc, zrpcunsafe (implies zrpc).
 .HP
 \fB\-experimentalfeatures\fR
 .IP
@@ -553,8 +563,7 @@ Password for JSON\-RPC connections
 .HP
 \fB\-rpcport=\fR<port>
 .IP
-Listen for JSON\-RPC connections on <port> (default: 7771 or testnet:
+Listen for JSON\-RPC connections on <port> (default: 0 or testnet: 10000)
-17771)
 .HP
 \fB\-rpcallowip=\fR<ip>
 .IP
@@ -583,11 +592,41 @@ output (default: 1 if running in a console, 0 otherwise)
 Number of seconds between metrics refreshes (default: 1 if running in a
 console, 600 otherwise)
 .PP
+Stratum server options:
+.HP
+\fB\-stratum\fR
+.IP
+Enable stratum server (default: off)
+.HP
+\fB\-stratumaddress=\fR<address>
+.IP
+Mining address to use when special address of 'x' is sent by miner
+(default: none)
+.HP
+\fB\-stratumbind=\fR<ipaddr>
+.IP
+Bind to given address to listen for Stratum work requests. Use
+[host]:port notation for IPv6. This option can be specified multiple
+times (default: bind to all interfaces)
+.HP
+\fB\-stratumport=\fR<port>
+.IP
+Listen for Stratum work requests on <port> (default: 19031 or testnet:
+19031)
+.HP
+\fB\-stratumallowip=\fR<ip>
+.IP
+Allow Stratum work requests from specified source. Valid for <ip> are a
+single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0)
+or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified
+multiple times
+.PP
 Hush Smart Chain options:
 .HP
 \fB\-ac_algo\fR
 .IP
-Choose PoW mining algorithm, default is Equihash
+Choose PoW mining algorithm, either 'equihash' or 'randomx'. default is
+Equihash (200,9)
 .HP
 \fB\-ac_blocktime\fR
 .IP
@@ -685,9 +724,12 @@ Enforce transaction\-rate limit, default 0
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://hush.is/security/>.
 
-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
 
 This is experimental Free Software! Fuck Yeah!!!!!

doc/man/komodo-cli.1

@@ -1,90 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH KOMODO-CLI "1" "December 2019" "komodo-cli v3.3.0" "User Commands"
-.SH NAME
-komodo-cli \- manual page for komodo-cli v3.3.0
-.SH DESCRIPTION
-Komodo RPC client version v3.3.0\-bde7744d9
-.PP
-In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://myhush.org/security/>.
-.SS "Usage:"
-.TP
-komodo\-cli [options] <command> [params]
-Send command to Komodo
-.TP
-komodo\-cli [options] help
-List commands
-.TP
-komodo\-cli [options] help <command>
-Get help for a command
-.SH OPTIONS
-.HP
-\-?
-.IP
-This help message
-.HP
-\fB\-conf=\fR<file>
-.IP
-Specify configuration file (default: komodo.conf)
-.HP
-\fB\-datadir=\fR<dir>
-.IP
-Specify data directory
-.HP
-\fB\-testnet\fR
-.IP
-Use the test network
-.HP
-\fB\-regtest\fR
-.IP
-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.
-.HP
-\fB\-rpcconnect=\fR<ip>
-.IP
-Send commands to node running on <ip> (default: 127.0.0.1)
-.HP
-\fB\-rpcport=\fR<port>
-.IP
-Connect to JSON\-RPC on <port> (default: 8232 or testnet: 18232)
-.HP
-\fB\-rpcwait\fR
-.IP
-Wait for RPC server to start
-.HP
-\fB\-rpcuser=\fR<user>
-.IP
-Username for JSON\-RPC connections
-.HP
-\fB\-rpcpassword=\fR<pw>
-.IP
-Password for JSON\-RPC connections
-.HP
-\fB\-rpcclienttimeout=\fR<n>
-.IP
-Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
-900)
-.HP
-\fB\-stdin\fR
-.IP
-Read extra arguments from standard input, one per line until EOF/Ctrl\-D
-(recommended for sensitive information such as passphrases)
-.SH COPYRIGHT
-
-In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://myhush.org/security/>.
-
-Copyright (C) 2009-2019 The Bitcoin Core Developers
-Copyright (C) 2015-2019 The Zcash Developers
-Copyright (C) 2015-2019 jl777 and SuperNET developers
-Copyright (C) 2018-2019 The Hush developers
-
-This is experimental software!!!
-
-Distributed under the MIT software license, see the accompanying file COPYING
-or <http://www.opensource.org/licenses/mit-license.php>.
-
-This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young.

doc/man/komodo-tx.1

@@ -1,103 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH KOMODO-TX "1" "December 2019" "komodo-tx v3.3.0" "User Commands"
-.SH NAME
-komodo-tx \- manual page for komodo-tx v3.3.0
-.SH DESCRIPTION
-Hush komodo\-tx utility version v3.3.0\-bde7744d9
-.SS "Usage:"
-.TP
-komodo\-tx [options] <hex\-tx> [commands]
-Update hex\-encoded zcash transaction
-.TP
-komodo\-tx [options] \fB\-create\fR [commands]
-Create hex\-encoded zcash transaction
-.SH OPTIONS
-.HP
-\-?
-.IP
-This help message
-.HP
-\fB\-create\fR
-.IP
-Create new, empty TX.
-.HP
-\fB\-json\fR
-.IP
-Select JSON output
-.HP
-\fB\-txid\fR
-.IP
-Output only the hex\-encoded transaction id of the resultant transaction.
-.HP
-\fB\-regtest\fR
-.IP
-Enter regression test mode, which uses a special chain in which blocks
-can be solved instantly.
-.HP
-\fB\-testnet\fR
-.IP
-Use the test network
-.PP
-Commands:
-.IP
-delin=N
-.IP
-Delete input N from TX
-.IP
-delout=N
-.IP
-Delete output N from TX
-.IP
-in=TXID:VOUT(:SEQUENCE_NUMBER)
-.IP
-Add input to TX
-.IP
-locktime=N
-.IP
-Set TX lock time to N
-.IP
-nversion=N
-.IP
-Set TX version to N
-.IP
-outaddr=VALUE:ADDRESS
-.IP
-Add address\-based output to TX
-.IP
-outscript=VALUE:SCRIPT
-.IP
-Add raw script output to TX
-.IP
-sign=HEIGHT:SIGHASH\-FLAGS
-.IP
-Add zero or more signatures to transaction. This command requires JSON
-registers:prevtxs=JSON object, privatekeys=JSON object. See
-signrawtransaction docs for format of sighash flags, JSON objects.
-.PP
-Register Commands:
-.IP
-load=NAME:FILENAME
-.IP
-Load JSON file FILENAME into register NAME
-.IP
-set=NAME:JSON\-STRING
-.IP
-Set register NAME to given JSON\-STRING
-.SH COPYRIGHT
-
-In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://myhush.org/security/>.
-
-Copyright (C) 2009-2019 The Bitcoin Core Developers
-Copyright (C) 2015-2019 The Zcash Developers
-Copyright (C) 2015-2019 jl777 and SuperNET developers
-Copyright (C) 2018-2019 The Hush developers
-
-This is experimental software!!!
-
-Distributed under the MIT software license, see the accompanying file COPYING
-or <http://www.opensource.org/licenses/mit-license.php>.
-
-This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young.

doc/man/komodod.1

@@ -1,637 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH KOMODOD "1" "December 2019" "komodod v3.3.0" "User Commands"
-.SH NAME
-komodod \- manual page for komodod v3.3.0
-.SH DESCRIPTION
-Hush Daemon version v3.3.0\-bde7744d9
-.PP
-In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://myhush.org/security/>.
-.SS "Usage:"
-.TP
-komodod [options]
-Start Hush\-flavored Komodo Daemon
-.SH OPTIONS
-.HP
-\-?
-.IP
-This help message
-.HP
-\fB\-alerts\fR
-.IP
-Receive and display P2P network alerts (default: 1)
-.HP
-\fB\-alertnotify=\fR<cmd>
-.IP
-Execute command when a relevant alert is received or we see a really
-long fork (%s in cmd is replaced by message)
-.HP
-\fB\-blocknotify=\fR<cmd>
-.IP
-Execute command when the best block changes (%s in cmd is replaced by
-block hash)
-.HP
-\fB\-checkblocks=\fR<n>
-.IP
-How many blocks to check at startup (default: 288, 0 = all)
-.HP
-\fB\-checklevel=\fR<n>
-.IP
-How thorough the block verification of \fB\-checkblocks\fR is (0\-4, default: 3)
-.HP
-\fB\-clientname=\fR<SomeName>
-.IP
-Full node client name, default 'MagicBean'
-.HP
-\fB\-conf=\fR<file>
-.IP
-Specify configuration file (default: komodo.conf)
-.HP
-\fB\-daemon\fR
-.IP
-Run in the background as a daemon and accept commands
-.HP
-\fB\-datadir=\fR<dir>
-.IP
-Specify data directory
-.HP
-\fB\-exportdir=\fR<dir>
-.IP
-Specify directory to be used when exporting data
-.HP
-\fB\-dbcache=\fR<n>
-.IP
-Set database cache size in megabytes (4 to 16384, default: 450)
-.HP
-\fB\-loadblock=\fR<file>
-.IP
-Imports blocks from external blk000??.dat file on startup
-.HP
-\fB\-maxorphantx=\fR<n>
-.IP
-Keep at most <n> unconnectable transactions in memory (default: 100)
-.HP
-\fB\-mempooltxinputlimit=\fR<n>
-.IP
-[DEPRECATED FROM OVERWINTER] Set the maximum number of transparent
-inputs in a transaction that the mempool will accept (default: 0 = no
-limit applied)
-.HP
-\fB\-par=\fR<n>
-.IP
-Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
-leave that many cores free, default: 0)
-.HP
-\fB\-pid=\fR<file>
-.IP
-Specify pid file (default: komodod.pid)
-.HP
-\fB\-prune=\fR<n>
-.IP
-Reduce storage requirements by pruning (deleting) old blocks. This mode
-disables wallet support and is incompatible with \fB\-txindex\fR. Warning:
-Reverting this setting requires re\-downloading the entire blockchain.
-(default: 0 = disable pruning blocks, >550 = target size in MiB to use
-for block files)
-.HP
-\fB\-reindex\fR
-.IP
-Rebuild block chain index from current blk000??.dat files on startup
-.HP
-\fB\-sysperms\fR
-.IP
-Create new files with system default permissions, instead of umask 077
-(only effective with disabled wallet functionality)
-.HP
-\fB\-txindex\fR
-.IP
-Maintain a full transaction index, used by the getrawtransaction rpc
-call (default: 0)
-.HP
-\fB\-addressindex\fR
-.IP
-Maintain a full address index, used to query for the balance, txids and
-unspent outputs for addresses (default: 0)
-.HP
-\fB\-timestampindex\fR
-.IP
-Maintain a timestamp index for block hashes, used to query blocks hashes
-by a range of timestamps (default: 0)
-.HP
-\fB\-spentindex\fR
-.IP
-Maintain a full spent index, used to query the spending txid and input
-index for an outpoint (default: 0)
-.HP
-\fB\-zindex\fR
-.IP
-Maintain extra statistics about shielded transactions and payments
-(default: 0)
-.PP
-Connection options:
-.HP
-\fB\-addnode=\fR<ip>
-.IP
-Add a node to connect to and attempt to keep the connection open
-.HP
-\fB\-banscore=\fR<n>
-.IP
-Threshold for disconnecting misbehaving peers (default: 100)
-.HP
-\fB\-bantime=\fR<n>
-.IP
-Number of seconds to keep misbehaving peers from reconnecting (default:
-86400)
-.HP
-\fB\-bind=\fR<addr>
-.IP
-Bind to given address and always listen on it. Use [host]:port notation
-for IPv6
-.HP
-\fB\-connect=\fR<ip>
-.IP
-Connect only to the specified node(s)
-.HP
-\fB\-discover\fR
-.IP
-Discover own IP addresses (default: 1 when listening and no \fB\-externalip\fR
-or \fB\-proxy\fR)
-.HP
-\fB\-dns\fR
-.IP
-Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (default: 1)
-.HP
-\fB\-dnsseed\fR
-.IP
-Query for peer addresses via DNS lookup, if low on addresses (default: 1
-unless \fB\-connect\fR)
-.HP
-\fB\-externalip=\fR<ip>
-.IP
-Specify your own public address
-.HP
-\fB\-forcednsseed\fR
-.IP
-Always query for peer addresses via DNS lookup (default: 0)
-.HP
-\fB\-listen\fR
-.IP
-Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
-.HP
-\fB\-listenonion\fR
-.IP
-Automatically create Tor hidden service (default: 1)
-.HP
-\fB\-maxconnections=\fR<n>
-.IP
-Maintain at most <n> connections to peers (default: 384)
-.HP
-\fB\-maxreceivebuffer=\fR<n>
-.IP
-Maximum per\-connection receive buffer, <n>*1000 bytes (default: 5000)
-.HP
-\fB\-maxsendbuffer=\fR<n>
-.IP
-Maximum per\-connection send buffer, <n>*1000 bytes (default: 1000)
-.HP
-\fB\-onion=\fR<ip:port>
-.IP
-Use separate SOCKS5 proxy to reach peers via Tor hidden services
-(default: \fB\-proxy\fR)
-.HP
-\fB\-onlynet=\fR<net>
-.IP
-Only connect to nodes in network <net> (ipv4, ipv6 or onion)
-.HP
-\fB\-permitbaremultisig\fR
-.IP
-Relay non\-P2SH multisig (default: 1)
-.HP
-\fB\-peerbloomfilters\fR
-.IP
-Support filtering of blocks and transaction with Bloom filters (default:
-1)
-.HP
-\fB\-port=\fR<port>
-.IP
-Listen for connections on <port> (default: 7770 or testnet: 17770)
-.HP
-\fB\-proxy=\fR<ip:port>
-.IP
-Connect through SOCKS5 proxy
-.HP
-\fB\-proxyrandomize\fR
-.IP
-Randomize credentials for every proxy connection. This enables Tor
-stream isolation (default: 1)
-.HP
-\fB\-seednode=\fR<ip>
-.IP
-Connect to a node to retrieve peer addresses, and disconnect
-.HP
-\fB\-timeout=\fR<n>
-.IP
-Specify connection timeout in milliseconds (minimum: 1, default: 5000)
-.HP
-\fB\-torcontrol=\fR<ip>:<port>
-.IP
-Tor control port to use if onion listening enabled (default:
-127.0.0.1:9051)
-.HP
-\fB\-torpassword=\fR<pass>
-.IP
-Tor control port password (default: empty)
-.HP
-\fB\-whitebind=\fR<addr>
-.IP
-Bind to given address and whitelist peers connecting to it. Use
-[host]:port notation for IPv6
-.HP
-\fB\-whitelist=\fR<netmask>
-.IP
-Whitelist peers connecting from the given netmask or IP address. Can be
-specified multiple times. Whitelisted peers cannot be DoS banned and
-their transactions are always relayed, even if they are already in the
-mempool, useful e.g. for a gateway
-.PP
-Wallet options:
-.HP
-\fB\-disablewallet\fR
-.IP
-Do not load the wallet and disable wallet RPC calls
-.HP
-\fB\-keypool=\fR<n>
-.IP
-Set key pool size to <n> (default: 100)
-.HP
-\fB\-paytxfee=\fR<amt>
-.IP
-Fee (in KMD/kB) to add to transactions you send (default: 0.00)
-.HP
-\fB\-rescan\fR
-.IP
-Rescan the block chain for missing wallet transactions on startup
-.HP
-\fB\-salvagewallet\fR
-.IP
-Attempt to recover private keys from a corrupt wallet.dat on startup
-.HP
-\fB\-sendfreetransactions\fR
-.IP
-Send transactions as zero\-fee transactions if possible (default: 0)
-.HP
-\fB\-spendzeroconfchange\fR
-.IP
-Spend unconfirmed change when sending transactions (default: 1)
-.HP
-\fB\-txconfirmtarget=\fR<n>
-.IP
-If paytxfee is not set, include enough fee so transactions begin
-confirmation on average within n blocks (default: 2)
-.HP
-\fB\-txexpirydelta\fR
-.IP
-Set the number of blocks after which a transaction that has not been
-mined will become invalid (default: 200)
-.HP
-\fB\-maxtxfee=\fR<amt>
-.IP
-Maximum total fees (in KMD) to use in a single wallet transaction;
-setting this too low may abort large transactions (default: 0.10)
-.HP
-\fB\-upgradewallet\fR
-.IP
-Upgrade wallet to latest format on startup
-.HP
-\fB\-wallet=\fR<file>
-.IP
-Specify wallet file (within data directory) (default: wallet.dat)
-.HP
-\fB\-walletbroadcast\fR
-.IP
-Make the wallet broadcast transactions (default: 1)
-.HP
-\fB\-walletnotify=\fR<cmd>
-.IP
-Execute command when a wallet transaction changes (%s in cmd is replaced
-by TxID)
-.HP
-\fB\-whitelistaddress=\fR<Raddress>
-.IP
-Enable the wallet filter for notary nodes and add one Raddress to the
-whitelist of the wallet filter. If \fB\-whitelistaddress=\fR is used, then the
-wallet filter is automatically activated. Several Raddresses can be
-defined using several \fB\-whitelistaddress=\fR (similar to \fB\-addnode\fR). The
-wallet filter will filter the utxo to only ones coming from my own
-Raddress (derived from pubkey) and each Raddress defined using
-\fB\-whitelistaddress=\fR this option is mostly for Notary Nodes).
-.HP
-\fB\-zapwallettxes=\fR<mode>
-.IP
-Delete all wallet transactions and only recover those parts of the
-blockchain through \fB\-rescan\fR on startup (1 = keep tx meta data e.g.
-account owner and payment request information, 2 = drop tx meta data)
-.PP
-ZeroMQ notification options:
-.HP
-\fB\-zmqpubhashblock=\fR<address>
-.IP
-Enable publish hash block in <address>
-.HP
-\fB\-zmqpubhashtx=\fR<address>
-.IP
-Enable publish hash transaction in <address>
-.HP
-\fB\-zmqpubrawblock=\fR<address>
-.IP
-Enable publish raw block in <address>
-.HP
-\fB\-zmqpubrawtx=\fR<address>
-.IP
-Enable publish raw transaction in <address>
-.PP
-Debugging/Testing options:
-.HP
-\fB\-debug=\fR<category>
-.IP
-Output debugging information (default: 0, supplying <category> is
-optional). If <category> is not supplied or if <category> = 1, output
-all debugging information. <category> can be: addrman, alert, bench,
-coindb, db, estimatefee, http, libevent, lock, mempool, net,
-partitioncheck, pow, proxy, prune, rand, reindex, rpc, selectcoins, tor,
-zmq, zrpc, zrpcunsafe (implies zrpc).
-.HP
-\fB\-experimentalfeatures\fR
-.IP
-Enable use of experimental features
-.HP
-\fB\-help\-debug\fR
-.IP
-Show all debugging options (usage: \fB\-\-help\fR \fB\-help\-debug\fR)
-.HP
-\fB\-logips\fR
-.IP
-Include IP addresses in debug output (default: 0)
-.HP
-\fB\-logtimestamps\fR
-.IP
-Prepend debug output with timestamp (default: 1)
-.HP
-\fB\-minrelaytxfee=\fR<amt>
-.IP
-Fees (in KMD/kB) smaller than this are considered zero fee for relaying
-(default: 0.000001)
-.HP
-\fB\-printtoconsole\fR
-.IP
-Send trace/debug info to console instead of debug.log file
-.HP
-\fB\-shrinkdebugfile\fR
-.IP
-Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR)
-.HP
-\fB\-testnet\fR
-.IP
-Use the test network
-.PP
-Node relay options:
-.HP
-\fB\-datacarrier\fR
-.IP
-Relay and mine data carrier transactions (default: 1)
-.HP
-\fB\-datacarriersize\fR
-.IP
-Maximum size of data in data carrier transactions we relay and mine
-(default: 8192)
-.PP
-Block creation options:
-.HP
-\fB\-blockminsize=\fR<n>
-.IP
-Set minimum block size in bytes (default: 0)
-.HP
-\fB\-blockmaxsize=\fR<n>
-.IP
-Set maximum block size in bytes (default: 2000000)
-.HP
-\fB\-blockprioritysize=\fR<n>
-.IP
-Set maximum size of high\-priority/low\-fee transactions in bytes
-(default: 1000000)
-.PP
-Mining options:
-.HP
-\fB\-mint\fR
-.IP
-Mint/stake coins automatically (default: 0)
-.HP
-\fB\-gen\fR
-.IP
-Mine/generate coins (default: 0)
-.HP
-\fB\-genproclimit=\fR<n>
-.IP
-Set the number of threads for coin mining if enabled (\fB\-1\fR = all cores,
-default: 0)
-.HP
-\fB\-equihashsolver=\fR<name>
-.IP
-Specify the Equihash solver to be used if enabled (default: "default")
-.HP
-\fB\-mineraddress=\fR<addr>
-.IP
-Send mined coins to a specific single address
-.HP
-\fB\-minetolocalwallet\fR
-.IP
-Require that mined blocks use a coinbase address in the local wallet
-(default: 1)
-.PP
-RPC server options:
-.HP
-\fB\-server\fR
-.IP
-Accept command line and JSON\-RPC commands
-.HP
-\fB\-rest\fR
-.IP
-Accept public REST requests (default: 0)
-.HP
-\fB\-rpcbind=\fR<addr>
-.IP
-Bind to given address to listen for JSON\-RPC connections. Use
-[host]:port notation for IPv6. This option can be specified multiple
-times (default: bind to all interfaces)
-.HP
-\fB\-rpcuser=\fR<user>
-.IP
-Username for JSON\-RPC connections
-.HP
-\fB\-rpcpassword=\fR<pw>
-.IP
-Password for JSON\-RPC connections
-.HP
-\fB\-rpcport=\fR<port>
-.IP
-Listen for JSON\-RPC connections on <port> (default: 7771 or testnet:
-17771)
-.HP
-\fB\-rpcallowip=\fR<ip>
-.IP
-Allow JSON\-RPC connections from specified source. Valid for <ip> are a
-single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0)
-or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified
-multiple times
-.HP
-\fB\-rpcthreads=\fR<n>
-.IP
-Set the number of threads to service RPC calls (default: 4)
-.PP
-Metrics Options (only if \fB\-daemon\fR and \fB\-printtoconsole\fR are not set):
-.HP
-\fB\-showmetrics\fR
-.IP
-Show metrics on stdout (default: 1 if running in a console, 0 otherwise)
-.HP
-\fB\-metricsui\fR
-.IP
-Set to 1 for a persistent metrics screen, 0 for sequential metrics
-output (default: 1 if running in a console, 0 otherwise)
-.HP
-\fB\-metricsrefreshtime\fR
-.IP
-Number of seconds between metrics refreshes (default: 1 if running in a
-console, 600 otherwise)
-.PP
-Komodo Asset Chain options:
-.HP
-\fB\-ac_algo\fR
-.IP
-Choose PoW mining algorithm, default is Equihash
-.HP
-\fB\-ac_blocktime\fR
-.IP
-Block time in seconds, default is 60
-.HP
-\fB\-ac_cc\fR
-.IP
-Cryptoconditions, default 0
-.HP
-\fB\-ac_beam\fR
-.IP
-BEAM integration
-.HP
-\fB\-ac_coda\fR
-.IP
-CODA integration
-.HP
-\fB\-ac_cclib\fR
-.IP
-Cryptoconditions dynamicly loadable library
-.HP
-\fB\-ac_ccenable\fR
-.IP
-Cryptoconditions to enable
-.HP
-\fB\-ac_ccactivate\fR
-.IP
-Block height to enable Cryptoconditions
-.HP
-\fB\-ac_decay\fR
-.IP
-Percentage of block reward decrease at each halving
-.HP
-\fB\-ac_end\fR
-.IP
-Block height at which block rewards will end
-.HP
-\fB\-ac_eras\fR
-.IP
-Block reward eras
-.HP
-\fB\-ac_founders\fR
-.IP
-Number of blocks between founders reward payouts
-.HP
-\fB\-ac_halving\fR
-.IP
-Number of blocks between each block reward halving
-.HP
-\fB\-ac_name\fR
-.IP
-Name of asset chain
-.HP
-\fB\-ac_notarypay\fR
-.IP
-Pay notaries, default 0
-.HP
-\fB\-ac_perc\fR
-.IP
-Percentage of block rewards paid to the founder
-.HP
-\fB\-ac_private\fR
-.IP
-Shielded transactions only (except coinbase + notaries), default is 0
-.HP
-\fB\-ac_pubkey\fR
-.IP
-Public key for receiving payments on the network
-.HP
-\fB\-ac_public\fR
-.IP
-Transparent transactions only, default 0
-.HP
-\fB\-ac_reward\fR
-.IP
-Block reward in satoshis, default is 0
-.HP
-\fB\-ac_sapling\fR
-.IP
-Sapling activation block height
-.HP
-\fB\-ac_script\fR
-.IP
-P2SH/multisig address to receive founders rewards
-.HP
-\fB\-ac_staked\fR
-.IP
-Percentage of blocks that are Proof\-Of\-Stake, default 0
-.HP
-\fB\-ac_supply\fR
-.IP
-Starting supply, default is 0
-.HP
-\fB\-ac_timelockfrom\fR
-.IP
-Timelocked coinbase start height
-.HP
-\fB\-ac_timelockgte\fR
-.IP
-Timelocked coinbase minimum amount to be locked
-.HP
-\fB\-ac_timelockto\fR
-.IP
-Timelocked coinbase stop height
-.HP
-\fB\-ac_txpow\fR
-.IP
-Enforce transaction\-rate limit, default 0
-.SH COPYRIGHT
-
-In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://myhush.org/security/>.
-
-Copyright (C) 2009-2019 The Bitcoin Core Developers
-Copyright (C) 2015-2019 The Zcash Developers
-Copyright (C) 2015-2019 jl777 and SuperNET developers
-Copyright (C) 2018-2019 The Hush developers
-
-This is experimental software!!!
-
-Distributed under the MIT software license, see the accompanying file COPYING
-or <http://www.opensource.org/licenses/mit-license.php>.
-
-This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young.

doc/randomx.md

@@ -0,0 +1,104 @@
+# RandomX
+
+Hush Smart Chains support using RandomX as a Proof-Of-Work algorithm as of release 3.9.2 .
+This means you can now launch a privacy coin with Hush tech that can be mined with a CPU
+instead of requiring an ASIC or GPU. RandomX is the same algorithm that Monero (XMR) and
+various other cryptocoins use. As far as we know, Hush Smart Chains are the first coins
+based on Zcash Protocol that can use the RandomX PoW algorithm. Many thanks to all the
+people who helped make this possible.
+
+# Example
+
+The following command can be used to launch an HSC on a single computer. Each option will be explained.
+HSC CLI arguments that start with `-ac_` means they *Affect Consensus*.
+
+```
+./src/hush-smart-chain -ac_halving=100 -ac_algo=randomx -ac_name=RANDOMX -ac_private=1 -ac_blocktime=15 -ac_reward=500000000 -ac_supply=55555 -gen=1 -genproclimit=1 -testnode=1
+```
+
+  * `hush-smart-chain` is the script used to launch or connect to HSCs
+    * It lives in the `./src` directory, next to `hushd` and `hush-cli`
+    * It is called `hush-smart-chain.bat` on Windows
+  * `-ac_halving=100` means "the block reward halves every 100 blocks"
+  * `-ac_algo=randomx` means "use RandomX for Proof-Of-Work
+    * The default is Equihash (200,9)
+  * `-ac_name=RANDOMX` sets the name of the HSC to RANDOMX
+  * `-ac_private=1` means only z2z transactions will be allowed, like HUSH mainnet
+  * `-ac_blocktime=15` means blocks will be 15 seconds on average
+    * The default is 60 seconds
+  * `-ac_reward=500000000` means the block reward will start at 5 RANDOMX coins per block
+    * This argument is given in satoshis
+  * `-ac_supply=55555` means an existing supply of 55555 will exist at block 1
+    * This argument is given in coins, not satoshis
+    * This is sometimes called a "pre-mine" and is useful when migrating an existing coin
+    * Block 0 of HSC's is always the BTC mainnet genesis block.
+    * So the genesis block of HSC's is actually block 1, not block 0
+  * `-gen=1` means this node is a mining node
+  * `-genproclimit=1` means use 1 CPU thread will be used for mining
+  * `-testnode=1` means only 1 node can be used to mine a genesis block
+    * testnode is primarily for testing, when launching a real genesis block, this option should not be used
+    * By default, at least two nodes are required to mine a genesis block
+    * One node would use
+```
+# first node
+./src/hush-smart-chain -ac_halving=100 -ac_algo=randomx -ac_name=RANDOMX -ac_private=1 -ac_blocktime=15 -ac_reward=500000000 -ac_supply=55555
+```
+    * And the second node would use:
+```
+# mining node. NOTE: This node will mine the genesis block and pre-mine, if any
+./src/hush-smart-chain -ac_halving=100 -ac_algo=randomx -ac_name=RANDOMX -ac_private=1 -ac_blocktime=15 -ac_reward=500000000 -ac_supply=55555 -gen=1 -genproclimit=1
+```
+
+# Advanced Options
+
+HUSH RandomX currently has two advanced options that some may want to use:
+
+  * `ac_randomx_interval` controls how often the RandomX key block will change
+    * The default is 1024 blocks and is good for most use cases.
+    * This corresponds to ~17 hours for HSCs with the default block time of 60s
+  * `ac_randomx_lag` sets the number of blocks to wait before updating the key block
+    * The default is 64 blocks
+    * This corresponds to 64 mins for HSCs with the default block time of 60s
+  * `ac_randomx_interval` should always be larger than 2 times `ac_randomx_lag`
+  * Setting these to arbitrary values could affect the chain security of your coin
+    * It is not recommended to change these values unless you are really sure why you are doing it
+
+# RandomX Internals
+
+This section is not required reading if you just want to use it as a PoW algorithm for an HSC. Here we will explain how the internals of RandomX works inside of the Hush codebase.
+
+We use the official RandomX implementation from https://github.com/tevador/RandomX with custom configuration options. If some type of hardware is created to mine the XMR RandomX algorithm, it will not be compatible with the Hush RandomX algorithm. This is by design. All Hush Smart Chains use the same RandomX config options, so if a hardware device is created to mine one HSC that uses RandomX, it can be used to mine any HSC using RandomX. Every HSC with unique consensus parameters will start off with it's own unique key block with at least 9 bytes of entropy.
+
+The source code of RandomX is embedded in the Hush source code at `./src/RandomX` and the configuration options used are at `./src/RandomX/src/configuration.h` .
+
+The changes from default RandomX configuration options are listed below.
+
+```
+ //Argon2d salt
+-#define RANDOMX_ARGON_SALT         "RandomX\x03"
++#define RANDOMX_ARGON_SALT         "RandomXHUSH\x03"
+
+ //Number of Argon2d iterations for Cache initialization.
+-#define RANDOMX_ARGON_ITERATIONS   3
++#define RANDOMX_ARGON_ITERATIONS   5
+ 
+ //Number of parallel lanes for Cache initialization.
+ #define RANDOMX_ARGON_LANES        1
+@@ -53,13 +53,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #define RANDOMX_DATASET_EXTRA_SIZE 33554368
+ 
+ //Number of instructions in a RandomX program. Must be divisible by 8.
+-#define RANDOMX_PROGRAM_SIZE       256
++#define RANDOMX_PROGRAM_SIZE       512
+ 
+ //Number of iterations during VM execution.
+-#define RANDOMX_PROGRAM_ITERATIONS 2048
++#define RANDOMX_PROGRAM_ITERATIONS 4096
+ 
+ //Number of chained VM executions per hash.
+-#define RANDOMX_PROGRAM_COUNT      8
++#define RANDOMX_PROGRAM_COUNT      16
+ 
+```
+RandomX opcode frequencies were not modfiied, the defaults are used.
+

doc/release-process.md

@@ -1,17 +1,53 @@
 # Hush Release Process
 
-## Pre-release
+## High-Level Philosophy
+
+Beware of making high-risk changes (such as consensus changes, p2p layer changes and wallet/transaction changes) too close to a new release, because they will not get as much testing as they should. Don't merge large branches which haven't undergone lots of testing just before a release.
+
+It is best to keep doc/relnotes/README.md up to date as changes and bug fixes are made. It's more work to summarize all changes and bugfixes just before the release.
+
+## Check for changes on master that should be on dev
+
+Often there are trivial changes made directly on master, such as documentation changes. In theory, no code changes should happen on master without being on dev first, but it's better to be safe than sorry. We want the dev branch which undergoes testing to be as close as possible to what the master branch will become, so we don't want to merge dev into master and just assume everything works. So it's best to merge the master branch into dev just before merging the dev branch into master.
+
+To check if the master branch has any changes that the dev branch does not:
+
+```
+# this assumes you are working with https://git.hush.is/hush/hush3 as your remote
+git checkout dev  
+git pull               # make sure dev is up to date
+git checkout master
+git pull               # make sure master is up to date
+git diff dev...master  # look at the set of changes which exist in master but not dev
+```
+
+If the last command has no output, congrats, there is nothing to do. If the last command has output, then you should merge master into dev:
+
+```
+git checkout dev
+git merge --no-ff master # using the default commit message is fine
+git push
+```
+
+The `--no-ff` flag above makes sure to make a merge commit, no matter what, even if a "fast forward" could be done. For those in the future looking back, it's much better to see evidence of when branches were merged.
+
 
 ### Git Issues
 
-Look for Git issues that should be fixed in the next release.
+Look for Git issues that should be fixed in the next release. Especially low-risk and simple things, like documentation changes, improvements to error messages and RPC help output. 
 
 ### Pre-release checklist:
-  * Is this release changing consensus rules?
+  * Is this release changing consensus rules? Definitely update protocol version.
 
 ### Protocol Safety Checks:
 
-  * Does MIN_PROTO_VERSION need to change?
+  * Does `PROTOCOL_VERSION` in src/version.h need to be increased?
+    * All releases with a consensus change should increase the value by 1
+    * This identifies a nodes protocol version to all other peers it connects to.
+  * Does `MIN_PEER_PROTO_VERSION` in src/version.h need to change?
+    * If it does, new nodes will not be able to talk to nodes with a version less than `MIN_PROTO_VERSION`
+  * The main use of these is for newer nodes that know they do not want to talk to older nodes to prevent connecting to older nodes efficiently
+  * For instance, when a new release has different consensus rules than older nodes, `MIN_PROTO_VERSION` prevents wasting lots of network bandwidth talking to incompatible nodes which will eventually be banned for disagreeing on consensus rules
 
 ## Release dependencies
 
@@ -21,4 +57,60 @@ Install deps on Linux:
 
 ## Release process
 
-...
+ - Update version in configure.ac and src/clientversion.h to update the hushd version
+   - In src/clientversion.h you update `CLIENT_VERSION_*` variables. Usually you will just update `CLIENT_VERSION_REVISION`
+   - If there is a consensus change, it may be a good idea to update `CLIENT_VERSION_MINOR` or `CLIENT_VERSION_MAJOR`
+   - To make a pre-release "beta" you can modify `CLIENT_VERSION_BUILD` but that is rarely done in Hush world.
+   - A `CLIENT_VERSION_BUILD` of 50 means "actual non-beta release"
+   - Make sure to keep the values in configure.ac and src/clientversion.h the same. The variables are prefixed wth an underscore in configure.ac
+ - Run `make manpages`, commit + push results
+   - hushd must be running so the script can automatically get the correct version number
+     - There is a hack in the script where you can hardcode a version number if hushd isn't running.
+     - Comment out the HUSHVER line and uncomment the line above it with a hardcoded version number
+   - PROTIP: Man page creation must be done after updating the version number and recompiling and before Debian package creation
+ - Update checkpoints in src/chainparams.cpp via util/checkpoints.pl
+   - hushd must be running to run this script, since it uses hush-cli to get the data
+   - Look for line which says "END HUSH mainnet checkpoint data" near line 560 in chainparams.cpp , that is where checkpoint data ends
+   - Find the highest block height of data, let's call it HEIGHT
+   - Run `./util/checkpoints.pl 1000 HEIGHT &> checkpoints.txt` to generate the latest checkpoint data
+   - To copy the new data from checkpoints.txt into the file, one way in Vim is to type ":r checkpoints.txt" which will read in a file and paste it as the current cursor
+   - You will see 3 lines of "stats" at the end of the output, you just pasted in the newest stats. Delete the old stats that should be the 3 lines under the current stats
+   - The script generates a comment "Generated at ...", that should be moved to the very beginning of the checkpoint data
+   - Make sure the new code compiles, commit and push
+   - Run `./util/checkpoints.pl help` to see some basic help
+     - By default it will generate checkpoints for every 1000 blocks, the "stride"
+     - You can get a different "stride" by passing it in as the first arg to the script
+     - To get checkpoint data for every 5000 blocks: `./util/checkpoints.pl 5000 &> checkpoints.txt`
+     - Currently checkpoints from before block 340k are given for every 5k blocks to keep the data smaller
+   - checkpoints.pl will just generate the data you need, it must be manually copied into the correct place
+   - Checkpoints are a list of block heights and block hashes that tell a full node the correct block history of the blockchain
+   - Checkpoints make block verification a bit faster, because nodes can say "is this block a descendant of a checkpoint block?" instead of doing full consensus checks, which take more time
+   - Checkpoints also provide a bit of security against some attacks that would create malicious chainforks
+     - They only provide limited security, because they talk about the past, not future block heights.
+   - Try to generate checkpoints as close to the release as possible, so you can have a recent block height be protected.
+     - For instance, don't update checkpoints and then do a release a month later. You can always update checkpoint data again or multiple times
+ - Update copyright years (if applicable) with util/replace.pl
+ - Update doc/relnotes/README.md
+   - To get the stats of file changes: `git diff --stat master...dev`
+ - Do a fresh clone and fresh sync with new checkpoints
+ - Stop node, wait 20 minutes, and then do a partial sync with new checkpoints
+ - Merge dev into master: `git checkout dev && git pull && git checkout master && git pull && git merge --no-ff dev && git push`
+   - The above command makes sure that your local dev branch is up to date before doing anything
+   - The above command will not merge if "git pull" creates a merge conflict
+   - The above command will not push if there is a problem with merging dev
+ - Make Gitea release with git tag from master branch (make sure to merge dev in first)
+   - Make sure git tag starts with a `v` such as `v3.9.2`
+ - Use util/gen-linux-binary-release.sh to make a Linux release binary
+ - Upload Linux binary to Gitea release and add SHA256 sum
+ - Use util/build-debian-package.sh to make an x86 Debian package for the release
+   - Debian packages should be done after you make manpages, because those are included in Debian packages
+   - `lintian` is an optional dependency, it's not needed to build the .deb
+   - Upload .deb to Gitea release
+   - Add SHA256 checksum of .deb to release
+ - Use util/build-debian-package-ARM.sh (does this still work?) to make an ARM Debian package for the release
+ - Upload the debian packages to the Gitea release page, with SHA256 sums
+ - Figure out how to update https://faq.hush.is/rpc/ for new release
+
+## Platform-specific notes
+
+Use `./util/build-mac.sh` to compile on Apple/Mac systems, use `./util/build-win.sh` to build on Windows and `./util/build-arm.sh` to build on ARMv8 systems.

doc/relnotes/README.md

@@ -10,9 +10,134 @@ and no longer on Github, since they banned Duke Leto and
 also because they censor many people around the world and work with
 evil organizations.
 
-# Hush 3.8.0 "XXX YYY"
+# Hush 3.9.3 "XXX"
+
+```
+...
+```
+
+# Hush 3.9.2 "Anecdotal Axolotl"
+
+```
+ 966 files changed, 26999 insertions(+), 2758 deletions(-)
+```
+
+This is an OPTIONAL release. It is recommended for exchanges, solo miners and mining pools to update to this release
+since it contains various bugfixes and improvements that will benefit busy wallets.
+
+  * This release adds RandomX support in Hush Smart Chains (HSCs)
+    * When creating a new HSC specify `-ac_algo=randomx` to use RandomX instead of Equihash
+    * Example: `hush-smart-chain -ac_name=RANDX -ac_algo=randomx ...`
+    * This allows HSCs to be mined with CPUs instead of ASICs
+    * Because of RandomX, `cmake` is a new dependency needed to compile Hush from source
+    * More detailed documentation available at https://git.hush.is/hush/hush3/src/branch/dev/doc/randomx.md
+    * For general info about HSCs see https://git.hush.is/hush/hush3/src/branch/dev/doc/hsc.md
+  * A new feature called "zsweep" has been added, which defaults to disabled.
+    * It will sweep funds from all zaddrs into a single specified zaddr
+    * A new RPC `z_sweepstatus` will show various details about the sweeping
+    * There are many advanced options to it, see full docs at https://git.hush.is/hush/hush3/src/branch/dev/doc/zsweep-consolidation.md
+  * Expired transactions will not be relayed and nodes who relay expired transactions are no longer banned
+    * A node relaying expired transactions is usually misconfigured or confused, not attacking us
+    * This change means node operators no longer need to deal with unbanning or allowlisting confused nodes
+  * Fix a rare coredump that could happen when nodes have many unconfirmed or expired transactions
+  * New RPC: `getblockmerkletree`, which will show the full Merkle Tree for a block height
+  * New RPC: `z_consolidationstatus` is similar to `z_sweepstatus` and will show config+stats about consolidation
+  * New RPC: `z_anonsettxdelta` : Returns delta (difference) in the anonset for a given txid.
+    * A delta > 0 increases the anonset
+    * A delta < 0 reduces the anonset
+    * A delta=0 leaves the anonset the same
+  * New RPC: `z_anonsetblockdelta` : Returns delta (difference) in the anonset for a given block.
+  * getrawtransaction RPC now returns a "size" key with the size in bytes of a transaction
+  * sendmany RPC will now reject transactions that send to taddrs immediately, instead of them being rejected in mempool
+  * Preliminary support for FreeBSD has been added to the Hush build system
+  * New contrib scripts:
+    * `contrib/gen-zaddrs.pl` - Generate zaddrs in bulk, defaults to 50
+    * `contrib/sdl_checkpoints.pl` - Generate SDL checkpoints using `getblockmerkletree`
+  * ZeroMQ support has been removed from Hush
+
+# Hush 3.9.1 "Luciferous Locust"
+
+This is an OPTIONAL release. It is most important for users with large wallets, as it fixes an important
+bug that causes the Hush full node to stop responding to requests. It is recommended for exchanges
+and mining pools to update to this release.
+```
+ 34 files changed, 6530 insertions(+), 6344 deletions(-)
+```
+
+  * Fix RPC deadlocks, which caused the RPC interface to hang.
+    * A special thanks to ex-Hush developer miodrag who reported this in an upstream issue comment.
+    * This turned out to be an upstream bug in Zcash that was inherited by Hush.
+    * More details can be found at https://git.hush.is/hush/hush3/issues/77
+  * The `listbanned` RPC now returns a new key `time_remaining` which tells how many
+    seconds are remaining in the ban
+  * The `rescan` RPC now works correctly when given a height. This can be used to do
+    a partial rescan from a custom height, without restarting the node.
+  * Minimum disk space required for a running full node has been increased to 1GB from 50MB
+    * This will print "Disk space is low!!!" and shut down the full node.
+    * To fix, free up disk space and restart the node.
+    * This change was implemented because in rare circumstances, large amounts of disk space
+      can be used up quickly, faster than the node checks for free disk space, which can lead
+      to a corrupt wallet.dat . Requiring more free disk space makes this much less likely.
+  * Dockerfile has been updated
+
+# Hush 3.9.0 "Unusual Ursid"
+```
+ 136 files changed, 3881 insertions(+), 3156 deletions(-)
+```
+
+This is a MANDATORY release, please update as soon as you can! At some point, full nodes older than 3.9.0
+will no longer be able to sync the current HUSH network correctly. More details will be given in a future update.
+
+  * :rainbow: hushd/hush-cli/hush-tx are now true binaries instead of shell scripts
+    * This means hushd.bat, hush-cli.bat and hush-tx.bat are no longer needed on Windows
+      and simplifies the maintenance of internals
+  * :tada: New official location for full node data is ~/.hush !
+    * New full nodes will install and use ~/.hush
+    * Existing full nodes will continue to use the legacy ~/.komodo directory
+    * If both ~/.hush/HUSH3 and ~/.komodo/HUSH3 exist, the ~/.hush directory will be used
+  * :kiss: Hush full nodes will now attempt to talk to two more nodes by default:
+    * node1.hush.land
+    * node2.hush.land
+  * :fork_and_knife: New RPCs:
+    * listaddresses - Show all taddrs in this wallet.dat
+    * rpcinfo - Shows stats about RPC internals
+  * :unicorn: These RPCs can now be run during RPC warmup:
+    * listaddresses
+    * z\_exportwallet
+    * signmessage
+    * decoderawtransaction
+    * getnetworkinfo
+  * :sweat_drops: New doc/hushd.service to use hushd with systemd
+    * Learn more at doc/hushd-systemd.md
+  * :rocket: Many updates to Hush Smart Chains and Hush internals
+    * Optimize zaddrs by only building witness caches for blocks that involve our wallet
+    * When RPC connection fails hush-cli now tells you which port it was trying to connect to
+    * Calculation of HSC "network magic" has changed as of 3.9.0
+        * If using or developing an HSC, all nodes must use either 3.8.0 or earlier, or
+          preferably, all use 3.9.0 code or later. HSC networks using both 3.8.0 and 3.9.0 will not work.
+        * This was required by internals changes and we do not plan to do this again.
+  * :hammer: New Stratum API so you can Solo mine with your full node!
+    * This is an optional feature that defaults to disabled. Enable it with `-stratum=1`
+    * Example usage: `hushd -stratum=1 -stratumport=31337 -stratumallowip=192.168.0.0/24'
+        * This allows mining connections from your local network where computers have IPs like 192.168.0.x .
+        * Your ASICs must be able to connect to the IP and port of your full node. Firewall rules may be needed.
+    * It offers the highest privacy for miners, since mining pools know your IP and address metadata and can be
+      hacked or coerced into giving that data. Solo mining with your own full node gives the absolute least metadata
+      to third parties.
+    * This is also the cheapest possible way to mine HUSH, since there are NO POOL FEES and NO PAYOUT TRANSACTION FEES! :smile:
+    * Miners can mine entire HUSH blocks from the privacy of their own server
+    * As many ASICs as you like can be used with a single Hush full node, just use an address inside a wallet you control,
+      and set your pool to the IP and port of your Hush full node with Stratum enabled.
+  * :nerd_face: The hush-smart-chain script is now installed in Debian packages
+
+# Hush 3.8.0 "Chuckling Chupacabra"
+
+```
+32 files changed, 712 insertions(+), 183 deletions(-)
+```
 
 This is an OPTIONAL release, but since it contains many privacy improvements, it's HIGHLY RECOMMENDED for all users to upgrade.
+It's VERY HIGHLY RECOMMENDED for mining pools to upgrade, since some improvements affect them.
 
     * New Sietch feature: Randomized change output location
       * Zcash and Pirate always put the change as the last shielded output, which leaks metadata. Hush no longer has this metadata leakage.
@@ -20,6 +145,8 @@ This is an OPTIONAL release, but since it contains many privacy improvements, it
     * New Sietch feature: Sitech-ified `z_shieldcoinbase`
       * This RPC now leaks less metadata by making it hard for blockchain analysts to know which of the three outputs has value.
       * This also increases Hush's "anonset velocity", which is how fast we increase our anonymity set, or "anonset".
+    * Thanks to [LuckPool](https://luckpool.net) for a patch that fixes how the longest chain is calculated.
+      * This bug can prevent mining pools from making payout transactions, which is why this release is HIGHLY RECOMMENDED for mining pools.
     * Previously you could only run `stop` while Hush was in RPC warmup, but now additional RPCs are allowed:
       * `stop` - Oops, you started hushd on accident a few seconds ago? Now you can stop it without waiting.
       * `help` - Get help during long rescans, finally!
@@ -28,10 +155,17 @@ This is an OPTIONAL release, but since it contains many privacy improvements, it
       * `listaddresses` - See a list of taddrs as soon as we load the wallet.
       * `dumpprivkey` - Dump the private key of a taddr, even when node isn't fully synced!
       * `getpeerinfo` - See current peers even before we get enough peers to start syncing or a long rescan!
+    * If the RPC interface is not functioning (such as filled by deadlocks or something else) it can become impossible to shut down hushd correctly!
+      * Doing a `kill` of the process could corrupt wallet.dat and cause a very long rescan.
+      * Now you can create a file called `plz_stop` in the same directory as wallet.dat
+      * `hushd` checks for this file every 120 seconds and will shutdown if it sees it.
     * `-keepnotewitnesscache` prevents the Sapling Note Witness cache from being deleted from wallet.dat on shutdown.
+      * If your hushd crashed or needed to be `kill -9`, do `hushd -keepnotewitnesscache -rescan -rescanheight=XXX` with a height of just before it crashed
+      * This will only rescan the latest part of the blockchain looking for new funds, instead of all of history. Much faster!
     * `-rescanheight` can be used with `-keepnotewitnesscache` and `-rescan` to do a partial rescan of history and avoid completely rebuilding the Witness Cache.
     * `-zindex` data is now stored on disk in the new `zindex.dat` file
       * All nodes that use `-zindex` will now have reliable anonset statistics even after a restart
+    * `getpeerinfo` now returns a `relaytxes` key which says if a remote node is relaying transactions to us
     * Improvements to the RPC help documentation
     * `hushd.bat` for Windows now uses the ASN map via `-asmap` and has the latest seed nodes
     * `hushd-tx.bat` for Windows now exists for making raw transactions on Windows

doc/wallet-backup.md

@@ -16,7 +16,7 @@ These instructions are specific for the officially supported Hush Linux client.
 
 There are multiple ways to make sure you have at least one other copy of the private keys needed to spend your HUSH and view your shielded HUSH.
 
-For all methods, you will need to include an export directory setting in your config file (`HUSH3.conf` located in the data directory which is `~/.komodo/HUSH3` unless it's been overridden with `datadir=` setting):
+For all methods, you will need to include an export directory setting in your config file (`HUSH3.conf` located in the data directory which is `~/.hush/HUSH3` or `~/.komodo/HUSH3` (Legacy Location) unless it's been overridden with `datadir=` setting):
 
 `exportdir=path/to/chosen/export/directory`
 

doc/zmq.md

@@ -1,107 +0,0 @@
-# Block and Transaction Broadcasting With ZeroMQ
-
-[ZeroMQ](http://zeromq.org/) is a lightweight wrapper around TCP
-connections, inter-process communication, and shared-memory,
-providing various message-oriented semantics such as publish/subscribe,
-request/reply, and push/pull.
-
-The Hush daemon can be configured to act as a trusted "border
-router", implementing the Hush wire 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
-requesting blockchain related data. However, there exists only a
-limited service to notify external software of events like the arrival
-of new blocks or transactions.
-
-The ZeroMQ facility implements a notification interface through a set
-of specific notifiers. Currently there are notifiers that publish
-blocks and transactions. This read-only facility requires only the
-connection of a corresponding ZeroMQ subscriber port in receiving
-software; it is not authenticated nor is there any two-way protocol
-involvement. Therefore, subscribers should validate the received data
-since it may be out of date, incomplete or even invalid.
-
-ZeroMQ sockets are self-connecting and self-healing; that is,
-connections made between two endpoints will be automatically restored
-after an outage, and either end may be freely started or stopped in
-any order.
-
-Because ZeroMQ is message oriented, subscribers receive transactions
-and blocks all-at-once and do not need to implement any sort of
-buffering or reassembly.
-
-## Prerequisites
-
-The ZeroMQ feature in Hush requires ZeroMQ API version 4.x 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
-*libzmq5-dev*. The C++ wrapper for ZeroMQ is *not* needed.
-
-In order to run the example Python client scripts in contrib/ one must
-also install *python-zmq*, though this is not necessary for daemon
-operation.
-
-## Enabling
-
-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 hushd:
-
-    $ ./configure --disable-zmq (other options)
-
-To actually enable operation, one must set the appropriate options on
-the commandline or in the configuration file.
-
-## Usage
-
-Currently, the following notifications are supported:
-
-    -zmqpubhashtx=address
-    -zmqpubhashblock=address
-    -zmqpubrawblock=address
-    -zmqpubrawtx=address
-
-The socket type is PUB and the address must be a valid ZeroMQ socket
-address. The same address can be used in more than one notification.
-
-For instance:
-
-    $ hushd -zmqpubhashtx=tcp://127.0.0.1:28332 \
-               -zmqpubrawtx=ipc:///tmp/hushd.tx.raw
-
-Each PUB notification has a topic and body, where the header
-corresponds to the notification type. For instance, for the
-notification `-zmqpubhashtx` the topic is `hashtx` (no null
-terminator) and the body is the hexadecimal transaction hash (32
-bytes).
-
-These options can also be provided in zcash.conf.
-
-ZeroMQ endpoint specifiers for TCP (and others) are documented in the
-[ZeroMQ API](http://api.zeromq.org/4-0:_start).
-
-Client side, then, the ZeroMQ subscriber socket must have the
-ZMQ_SUBSCRIBE option set to one or either of these prefixes (for
-instance, just `hash`); without doing so will result in no messages
-arriving. Please see `contrib/zmq/zmq_sub.py` for a working example.
-
-## Remarks
-
-From the perspective of hushd, the ZeroMQ socket is write-only; PUB
-sockets don't even have a read function. Thus, there is no state
-introduced into hushd 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
-is assumed that the ZeroMQ port is exposed only to trusted entities,
-using other means such as firewalling.
-
-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.
-
-There are several possibilities that ZMQ notification can get lost
-during transmission depending on the communication type you are
-using. Hushd appends an up-counting sequence number to each
-notification which allows listeners to detect lost notifications.

doc/zsweep-consolidation.md

@@ -0,0 +1,76 @@
+# zsweep and consolidation
+
+This is to document zsweep and consolidation for advanced HUSH users.
+
+**Warning: If you don't know what Zsweep or Consolidation are, there is a good chance that you will not be using these advanced options. User beware!**
+
+# Table of Contents
+1. [Using Zsweep](#zsweep)
+1. [Using Consolidation](#consolidation)
+1. [Using Zsweep & Consolidation Together](#zsweep-&-consolidation-together)
+
+# Pre-Step & Further Details
+
+A user can use these options at the command line, but it is **recommended to configure these options within the HUSH3.conf file**.
+
+Consolidation takes many unspent shielded UTXOs (zutxos) into one zutxo, which makes spending them in the future faster and potentially cost less in fees. It also helps prevent certain kinds of metadata leakages and spam attacks. It is not recommended for very large wallets (wallet.dat files with thousands of transactions) for performance reasons. This is why it defaults to OFF for CLI full nodes but ON for GUI wallets that use an embedded hushd.
+
+Zsweep is when you sweep numerous zutxos into one z-address that you configure. This z-address can be local to that system or it can be configured to sweep to a remote wallet on a different system with the zsweepexternal=1 option, which is explained below in the Zsweep section.
+
+## Zsweep
+
+1. We add the following to our conf file as per the Pre-Step.
+	```
+	zsweep=1
+	zsweepaddress=zs1...
+	```
+
+1. The above zsweepaddress will be the z-address you want to sweep into (zs1... is a placeholder for this documentation) and it must exist within the same local wallet you are configuring this for. If you want to zsweep to an address on another computer, then set zsweepexternal=1 as explained in the options below.
+
+1. The following are optional zsweep settings with their details:
+
+	| Zsweep Option Name| Details of what it does |
+	|-------------------|-------------------------|
+	| zsweepexternal=1	| Will enable the option to zsweep to an "external" z-address which exists in a wallet on a different system. |
+	| zsweepinterval=5	| By default zsweep runs every 5 blocks, so set and modify this value to change that. |
+	| zsweepmaxinputs=50 | By default zsweep makes sure to not reduce the anonset in any tx by having a maximum number of inputs of 8. This should be fine for new wallets, but if you have an existing wallet with many zutxos it can be changed with this option. Keep in mind that large values will make sweeping faster at the expense of reducing the AnonSet. |
+	| zsweepfee=0 | The default zsweep fee is 10000 puposhis or 0.0001 HUSH, the default for all transactions. To use fee=0 for zsweep transactions, set this option. |
+    | zsweepexclude=zs1... | Exclude a certain address from being swept. Can be used multiple times to exclude multiple addressses |
+
+1. The following HUSH RPC will let you view your zsweep configuration options and run-time stats at the command line: `hush-cli z_sweepstatus`
+
+## Consolidation
+
+1. We add the following to our conf file as per the Pre-Step.
+	```
+	consolidation=1
+	```
+
+1. The following are optional consolidation settings with their details:
+
+	| Consolidation Option Name| Details of what it does |
+	|--------------------------|-------------------------|
+	| consolidationtxfee=0     | The default consolidation fee is 10000 puposhis or 0.0001 HUSH, the default for all transactions. To use fee=0 for consolidation transactions, set this option. |
+	| consolidatesaplingaddress=zs1... | Default of consolidation is set to all, but you can set this option if you have one specific z-address (zs1... is a placeholder for this documentation) that you want to only consolidate to. |
+
+1. The following HUSH RPC will let you view your consolidation configuration options and run-time stats at the command line: `hush-cli z_sweepstatus`
+
+## Zsweep & Consolidation Together
+
+1. We add the following to our conf file as per the Pre-Step.
+	```
+	zsweep=1
+	zsweepaddress=zs1...
+	consolidation=1
+	```
+
+1. Then follow along with the zsweep section above if you want to set specific options for the zsweep behavior.
+
+### Copyright
+
+jahway603 and The Hush Developers
+
+### License
+
+GPLv3
+

migratecoin.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/bash
+#!/usr/usr/bin/env bash
-# Copyright (c) 2016-2021 The Hush developers
+# 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 makes the neccesary transactions to migrate
@@ -11,7 +11,7 @@ address="Rxxx"
 amount=1
 
 # Alias for running cli on source chain
-cli_source="komodo-cli -ac_name=$source"
+cli_source="hush-cli -ac_name=$source"
 
 # Raw tx that we will work with
 txraw=`$cli_source createrawtransaction "[]" "{\"$address\":$amount}"`
@@ -37,7 +37,7 @@ read -p "Wait for a notarization to HUSH, and then two more notarizations from t
 
 # Create import
 importTx=`$cli_source migrate_createimporttransaction $exportSignedTx $payouts`
-importTx=`komodo-cli migrate_completeimporttransaction $importTx`
+importTx=`hush-cli migrate_completeimporttransaction $importTx`
 
 # Send import
-komodo-cli -ac_name=$target sendrawtransaction $importTx
+hush-cli -ac_name=$target sendrawtransaction $importTx

qa/hush/checksec.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # The BSD License (http://www.opensource.org/licenses/bsd-license.php) 
 # specifies the terms and conditions of use for checksec.sh:

qa/hush/create_benchmark_archive.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 import binascii

qa/hush/create_wallet_200k_utxos.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2017 The Zcash developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/hush/full-test-suite.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Execute all of the automated tests related to Hush
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/hush/full_test_suite.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 # Execute all of the automated tests related to Hush
@@ -145,7 +145,7 @@ STAGES = [
 
 STAGE_COMMANDS = {
     'btest': [repofile('src/test/test_bitcoin'), '-p'],
-    'gtest': [repofile('src/komodo-gtest')],
+    'gtest': [repofile('src/hush-gtest')],
     'sec-hard': check_security_hardening,
     'no-dot-so': ensure_no_dot_so_in_depends,
     'util-test': util_test,

qa/pull-tester/cc-tests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e -o pipefail
 
 CURDIR=$(cd $(dirname "$0"); pwd)

qa/pull-tester/rpc-tests.sh

@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Released under the GPLv3
 
 set -e -o pipefail
@@ -92,10 +92,6 @@ testScriptsExt=(
     'p2p-acceptblock.py'
 );
 
-if [ "x$ENABLE_ZMQ" = "x1" ]; then
-  testScripts+=('zmq_test.py')
-fi
-
 extArg="-extended"
 passOn=${@#$extArg}
 

qa/pull-tester/run-bitcoin-cli

@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Released under the GPLv3
 
 # This is a thin wrapper around bitcoin-cli that strips the Windows-style EOLs

qa/pull-tester/run-bitcoind-for-test.sh.in

@@ -1,11 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # THIS FILE IS GENERATED FROM run-bitcoind-for-test.sh.in
 # Copyright (c) 2013-2014 The Bitcoin Core developers
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Released under the GPLv3
 #
 HUSH_LOAD_TIMEOUT=500
-DATADIR="@abs_top_builddir@/.komodo/HUSH3"
+# TODO: support legacy directory. For now, those that want
+# to run tests must use the non-legacy directory
+DATADIR="@abs_top_builddir@/.hush/HUSH3"
 rm -rf "$DATADIR"
 mkdir -p "$DATADIR"/regtest
 touch "$DATADIR/HUSH3.conf"

qa/pull-tester/tests-config.sh.in

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # THIS FILE IS GENERATED FROM tests-config.sh.in
 # Copyright (c) 2013-2014 The Bitcoin Core developers
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Released under the GPLv3
 
 BUILDDIR="@abs_top_builddir@"
@@ -11,7 +11,6 @@ EXEEXT="@EXEEXT@"
 @ENABLE_WALLET_TRUE@ENABLE_WALLET=1
 @BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
-@ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1
 @ENABLE_PROTON_TRUE@ENABLE_PROTON=1
 
 REAL_BITCOIND="$BUILDDIR/src/hushd${EXEEXT}"

qa/rpc-tests/README.md

@@ -42,7 +42,7 @@ If you get into a bad state, you should be able to recover with:
 
 ```bash
 rm -rf cache
-killall komodod
+killall hushd
 ```
 
 but beware that could kill various other processes you might not want to kill!

qa/rpc-tests/ac_private.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/addressindex.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python2
 # Copyright (c) 2014-2015 The Bitcoin Core developers
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 # Test addressindex generation and fetching

qa/rpc-tests/bip65-cltv-p2p.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# 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
 

qa/rpc-tests/bipdersig-p2p.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Distributed under the GPLv3/X11 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 #

qa/rpc-tests/blockchain.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2014 The Bitcoin Core developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/cryptoconditions.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/cryptoconditions_channels.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/cryptoconditions_dice.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/cryptoconditions_faucet.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/cryptoconditions_gateways.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/cryptoconditions_heir.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/cryptoconditions_oracles.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/cryptoconditions_rewards.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/cryptoconditions_token.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2018 SuperNET developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html

qa/rpc-tests/decodescript.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2022 The Hush developers
 # Copyright (c) 2015 The Bitcoin Core developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html