Merge branch 'duke' into danger

2023-06-17 09:48:31 -04:00
parent 739fe4d1f3 97c7e814cf
commit e608600f07
879 changed files with 12754 additions and 6079 deletions
--- a/.gitignore
+++ b/.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/
--- a/CONTRIBUTING.md
+++ b/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.

--- a/DEVELOPING.md
+++ b/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.
--- a/6
+++ b/6
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
@@ -26,7 +26,7 @@ RUN 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/zcutil/docker-hush-cli.sh /usr/bin/hush-cli
+    ln -sf /hush/util/docker-entrypoint.sh /usr/bin/entrypoint && \
+    ln -sf /hush/util/docker-hush-cli.sh /usr/bin/hush-cli

 CMD ["entrypoint"]
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -24,8 +24,8 @@ sudo swapon /swapfile
 ```sh
 # 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 \
-      bsdmainutils automake curl unzip nano libsodium-dev
+      autoconf libtool ncurses-dev unzip git zlib1g-dev wget \
+      bsdmainutils automake curl unzip nano libsodium-dev cmake
 # clone git repo
 git clone https://git.hush.is/hush/hush3
 cd hush3
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 2016-2021 The Hush developers
+# Copyright 2016-2023 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

@@ -24,8 +24,8 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX

 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)

-BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
-	$(top_srcdir)/contrib/devtools/security-check.py
+BIN_CHECKS=$(top_srcdir)/util/symbol-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,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-man
 clean-local:
 	rm -rf test_bitcoin.coverage/ total.coverage/

+seeds:
+	./contrib/seeds/generate-seeds.py contrib/seeds > src/chainparamsseeds.h
+
+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
--- a/OLD_WALLETS.md
+++ b/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,
--- a/README.md
+++ b/README.md
@@ -42,9 +42,11 @@ Please refer to the instructions which apply to you below:

 If you have an older wallet, then refer to [OLD_WALLETS.md](OLD_WALLETS.md).

-### Official Explorer
+### Official Explorers

-The link for the Official Hush explorer is: [explorer.hush.is](https://explorer.hush.is)
+The links for the Official Hush explorers:
+  * [explorer.hush.is](https://explorer.hush.is)
+  * [explorer.hush.land](https://explorer.hush.land)

 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.
@@ -62,9 +64,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
-* Follow <a href="https://hush.is/yt">Hush</a> on YouTube
-* Join <a href="https://hush.is/reddit">Hush</a> on Reddit
+* Twitter: <a href="https://hush.is/twitter">@hushisprivacy</a>
+* Matrix: <a href="https://hush.is/matrix">@hush_main:meowchat.xyz</a>
+* 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

--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,19 @@
-#!/bin/bash
-# Copyright (c) 2016-2021 The Hush developers
+#!/usr/bin/env bash
+# Copyright (c) 2016-2023 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
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,14 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
+dnl Must be kept in sync with src/clientversion.h , ugh!
 define(_CLIENT_VERSION_MINOR, 9)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 3)
 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, 2023)
 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 +152,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)])],
@@ -227,6 +222,29 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
  AX_CHECK_COMPILE_FLAG([-Wunused-local-typedef],[CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedef"],,[[$CXXFLAG_WERROR]])
  AX_CHECK_COMPILE_FLAG([-Wdeprecated-register],[CXXFLAGS="$CXXFLAGS -Wno-deprecated-register"],,[[$CXXFLAG_WERROR]])
 fi
+
+TEMP_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS $SSE42_CXXFLAGS"
+AC_MSG_CHECKING(for assembler crc32 support)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+    #include <stdint.h>
+    #if defined(_MSC_VER)
+    #include <intrin.h>
+    #elif defined(__GNUC__) && defined(__SSE4_2__)
+    #include <nmmintrin.h>
+    #endif
+  ]],[[
+    uint64_t l = 0;
+    l = _mm_crc32_u8(l, 0);
+    l = _mm_crc32_u32(l, 0);
+    l = _mm_crc32_u64(l, 0);
+    return l;
+  ]])],
+ [ AC_MSG_RESULT(yes); enable_hwcrc32=yes],
+ [ AC_MSG_RESULT(no)]
+)
+CXXFLAGS="$TEMP_CXXFLAGS"
+
 CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"

 AC_ARG_WITH([utils],
@@ -247,6 +265,16 @@ AC_ARG_WITH([daemon],
  [build_bitcoind=$withval],
  [build_bitcoind=yes])

+GCC_TARGET=`$CC -dumpmachine 2>&1`
+case $GCC_TARGET in
+  arm*-*-*)
+    have_arm=true
+    ;;
+  aarch64*-*-*)
+    have_arm=true
+    ;;
+esac
+
 use_pkgconfig=yes
 case $host in
  *mingw*)
@@ -673,15 +701,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 +737,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 +822,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])
@@ -853,6 +849,7 @@ AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
 AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet = xyes])
 AM_CONDITIONAL([ENABLE_MINING],[test x$enable_mining = xyes])
 AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes])
+AM_CONDITIONAL([ARCH_ARM], [test x$have_arm = xtrue])
 AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
 AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
 AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
@@ -894,7 +891,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 +940,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"
--- a/contrib/README.md
+++ b/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

--- a/contrib/block_time.pl
+++ b/contrib/block_time.pl
@@ -1,5 +1,5 @@
-#!/usr/bin/perl
-# Copyright (c) 2016-2021 The Hush developers
+#!/usr/bin/env perl
+# Copyright (c) 2016-2023 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;
--- a/contrib/checkpoints.pl
+++ b/contrib/checkpoints.pl
@@ -1,60 +0,0 @@
-#!/usr/bin/perl
-# 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
-use warnings;
-use strict;
-
-# Generate checkpoint data for use in src/chainparams.cpp
-my $perday  = 1152;
-my $hush    = "./src/hush-cli";
-my $gethash = "$hush getblockhash";
-my $stride  = shift || 1000;
-my $count   = 0;
-my $blocks  = qx{$hush getblockcount};
-if($?) {
-    print "ERROR, exiting...\n";
-    exit 1;
-}
-my $prev    = $blocks - $perday;
-my $last    = 0;
-my $now     = time();
-chomp($blocks);
-
-print "// Generated at $now via hush3 contrib/checkpoints.pl by Duke Leto\n";
-
-while (1) {
-	$count++;
-	my $block = $stride*$count;
-	if ($block > $blocks) {
-		$last = $stride*($count-1);
-        #print "last checkpointed block=$last\n";
-        last;
-    }
-	my $blockhash = qx{$gethash $block};
-	chomp $blockhash;
-	print qq{($block,     uint256S("0x$blockhash"))\n};
-}
-my $time    = qx{$hush getblock $last |grep time|cut -d: -f2| sed 's/,//g'};
-chomp($time);
-# TODO: This is Linux-only and assumes new (not legacy) dir
-my $line1       = qx{grep --text height=$prev   ~/.hush/HUSH3/debug.log};
-my $line2       = qx{grep --text height=$blocks ~/.hush/HUSH3/debug.log};
-my $txs_per_day = 2 * $perday; # default estimate is 2 txs per block, on average
-my $total_txs   = 0;
-#print "line1: $line1\n";
-#print "line2: $line2\n";
-
-# This will calculate the number of txs in the previous day to the last checkpointed block
-if ($line1 =~ m/tx=(\d+)/) {
-    my $tx1 = $1; # number of txs in the block 1 day ago
-    #print "prevblock has $tx1 txs\n";
-    if ($line2 =~ m/tx=(\d+)/) {
-        $total_txs = $1;
-        # TODO: average of last N days might be better
-        $txs_per_day  = $total_txs - $tx1;
-    }
-}
-print ",(int64_t) $time, // time of last checkpointed block\n";
-print "(int64_t) $total_txs,      // total txs\n";
-print "(double)  $txs_per_day        // txs in the last day before block $blocks\n";
--- a/contrib/debian/copyright
+++ b/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
--- a/contrib/devtools/README.md
+++ b/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/
--- a/contrib/devtools/optimize-pngs.py
+++ b/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"
--- a/contrib/fresh_clone_compile_and_run.sh
+++ b/contrib/fresh_clone_compile_and_run.sh
@@ -1,19 +1,28 @@
-#!/bin/bash
-# Copyright (c) 2016-2021 The Hush developers
+#!/usr/bin/env bash
+# Copyright (c) 2016-2023 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
-# 5 HUSH as thanks for decentralized performance testing
+
+# Usage: $0 BRANCH JOBS
+# 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
--- a/contrib/gen-zaddrs.pl
+++ b/contrib/gen-zaddrs.pl
@@ -0,0 +1,17 @@
+#!/usr/bin/env perl
+# Copyright 2019-2023 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++;
+}
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/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}
--- a/contrib/gitian-descriptors/gitian-osx-signer.yml
+++ b/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}
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/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}
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/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}
--- a/contrib/hush_halvings
+++ b/contrib/hush_halvings
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 The Hush developers
 # Released under the GPLv3

 use strict;
--- a/contrib/hush_scanner
+++ b/contrib/hush_scanner
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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;
--- a/contrib/hush_supply
+++ b/contrib/hush_supply
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 The Hush developers
 # Released under the GPLv3
 use warnings;
 use strict;
--- a/contrib/init/hushd.conf
+++ b/contrib/init/hushd.conf
@@ -35,12 +35,6 @@ pre-start script
        echo
        echo "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
        echo
-        echo "It is also recommended that you also set alertnotify so you are "
-        echo "notified of problems:"
-        echo
-        echo "ie: alertnotify=echo %%s | mail -s \"Hush Alert\"" \
-            "admin@foo.com"
-        echo
        exit 1
    fi

--- a/contrib/init/hushd.init
+++ b/contrib/init/hushd.init
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 #  hushd The hush core server.
 #
--- a/contrib/init/hushd.openrc
+++ b/contrib/init/hushd.openrc
@@ -81,11 +81,6 @@ checkconfig()
 		eerror ""
 		eerror "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
 		eerror ""
-		eerror "It is also recommended that you also set alertnotify so you are "
-		eerror "notified of problems:"
-		eerror ""
-		eerror "ie: alertnotify=echo %%s | mail -s \"Hush Alert\"" \
-			"admin@foo.com"
 		eerror ""
 		return 1
 	fi
--- a/contrib/macdeploy/SDBackground.png
+++ b/contrib/macdeploy/SDBackground.png
--- a/contrib/macdeploy/sd-macdeploy.command
+++ b/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
--- a/contrib/sda_checkpoints.pl
+++ b/contrib/sda_checkpoints.pl
@@ -0,0 +1,48 @@
+#!/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 checkpoint data used by the SilentDragon Android SDK
+# https://git.hush.is/fekt/hush-android-wallet-sdk/src/branch/main/sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet
+
+use warnings;
+use strict;
+my $hush    = "./src/hush-cli";
+my $getblock= "$hush getblock";
+my $gethash = "$hush getblockhash";
+my $gettree = "$hush getblockmerkletree";
+my $start   = shift || 1190000;
+my $end     = shift || 1260000;
+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 $blocktime = qx{$getblock $block | grep time};
+	my $merkle    = qx{$gettree $block};
+    chomp $merkle;
+    chomp $blockhash;
+    chomp $blocktime;
+    $blocktime =~ s/^\s+|\s+$//g ;
+    print qq{{\n\t"network": "main",\n\t"height": "$block",\n\t"hash": "$blockhash",\n\t$blocktime\n\t"saplingTree": "$merkle"\n},\n};
+
+    $block += $stride;
+}
--- a/contrib/sdl_checkpoints.pl
+++ b/contrib/sdl_checkpoints.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright (c) 2016-2022 The Hush developers
+# Copyright (c) 2016-2023 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

--- a/contrib/seeds/README.md
+++ b/contrib/seeds/README.md
@@ -1,8 +1,10 @@
-### Seeds ###
+# Seeds

 Utility to generate the seeds.txt list that is compiled into the client
-(see [src/chainparamsseeds.h](/src/chainparamsseeds.h) and other utilities in [contrib/seeds](/contrib/seeds)).
+(see [src/chainparamsseeds.h](hush/hush3/src/branch/master/src/chainparamsseeds.h) and other utilities in [contrib/seeds](hush/hush3/src/branch/master/contrib/seeds/)).
+
+## Updating seeds
+
+Update [contrib/seeds/nodes_main.txt](hush/hush3/src/branch/master/contrib/seeds/nodes_main.txt) and run `make seeds` in the root directory of this repo to update [src/chainparamsseeds.h](hush/hush3/src/branch/master/src/chainparamsseeds.h) then commit the result.

-The 512 seeds compiled into the 0.10 release were created from sipa's DNS seed data, like this:

-	curl -s http://bitcoin.sipa.be/seeds.txt | makeseeds.py
--- a/contrib/seeds/generate-seeds.py
+++ b/contrib/seeds/generate-seeds.py
@@ -1,5 +1,6 @@
-#!/usr/bin/env python
-# Copyright (c) 2014 Wladimir J. van der Laan
+#!/usr/bin/env python3
+# Copyright (c) 2016-2023 The Hush developers
+# Copyright (c) 2014-2021 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
 '''
@@ -11,45 +12,63 @@ argument:
    nodes_main.txt
    nodes_test.txt

-These files must consist of lines in the format 
+These files must consist of lines in the format

-    <ip>
    <ip>:<port>
-    [<ipv6>]
+    <ip>
    [<ipv6>]:<port>
+    [<ipv6>]
+    <onion>.onion:<port>
    <onion>.onion
-    0xDDBBCCAA (IPv4 little-endian old pnSeeds format)
+    <i2p>.b32.i2p:<port>
+    <i2p>.b32.i2p

 The output will be two data structures with the peers in binary format:

-   static SeedSpec6 pnSeed6_main[]={
-   ...
-   }
-   static SeedSpec6 pnSeed6_test[]={
+   static const uint8_t chainparams_seed_{main,test}[]={
   ...
   }

-These should be pasted into `src/chainparamsseeds.h`.
+To update the generated code :
+
+./contrib/seeds/generate-seeds.py contrib/seeds > src/chainparamsseeds.h
+
 '''
-from __future__ import print_function, division
+
 from base64 import b32decode
-from binascii import a2b_hex
-import sys, os
+from enum import Enum
+import struct
+import sys
+import os
 import re

-# ipv4 in ipv6 prefix
-pchIPv4 = bytearray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff])
-# tor-specific ipv6 prefix
-pchOnionCat = bytearray([0xFD,0x87,0xD8,0x7E,0xEB,0x43])
+class BIP155Network(Enum):
+    IPV4 = 1
+    IPV6 = 2
+    TORV2 = 3  # no longer supported
+    TORV3 = 4
+    I2P = 5
+    CJDNS = 6

-def name_to_ipv6(addr):
-    if len(addr)>6 and addr.endswith('.onion'):
+def name_to_bip155(addr):
+    '''Convert address string to BIP155 (networkID, addr) tuple.'''
+    if addr.endswith('.onion'):
        vchAddr = b32decode(addr[0:-6], True)
-        if len(vchAddr) != 16-len(pchOnionCat):
-            raise ValueError('Invalid onion %s' % s)
-        return pchOnionCat + vchAddr
+        if len(vchAddr) == 35:
+            assert vchAddr[34] == 3
+            return (BIP155Network.TORV3, vchAddr[:32])
+        elif len(vchAddr) == 10:
+            return (BIP155Network.TORV2, vchAddr)
+        else:
+            raise ValueError('Invalid onion %s' % vchAddr)
+    elif addr.endswith('.b32.i2p'):
+        vchAddr = b32decode(addr[0:-8] + '====', True)
+        if len(vchAddr) == 32:
+            return (BIP155Network.I2P, vchAddr)
+        else:
+            raise ValueError(f'Invalid I2P {vchAddr}')
    elif '.' in addr: # IPv4
-        return pchIPv4 + bytearray((int(x) for x in addr.split('.')))
+        return (BIP155Network.IPV4, bytes((int(x) for x in addr.split('.'))))
    elif ':' in addr: # IPv6
        sub = [[], []] # prefix, suffix
        x = 0
@@ -66,14 +85,13 @@ def name_to_ipv6(addr):
                sub[x].append(val & 0xff)
        nullbytes = 16 - len(sub[0]) - len(sub[1])
        assert((x == 0 and nullbytes == 0) or (x == 1 and nullbytes > 0))
-        return bytearray(sub[0] + ([0] * nullbytes) + sub[1])
-    elif addr.startswith('0x'): # IPv4-in-little-endian
-        return pchIPv4 + bytearray(reversed(a2b_hex(addr[2:])))
+        return (BIP155Network.IPV6, bytes(sub[0] + ([0] * nullbytes) + sub[1]))
    else:
        raise ValueError('Could not parse address %s' % addr)

-def parse_spec(s, defaultport):
-    match = re.match('\[([0-9a-fA-F:]+)\](?::([0-9]+))?$', s)
+def parse_spec(s):
+    '''Convert endpoint string to BIP155 (networkID, addr, port) tuple.'''
+    match = re.match(r'\[([0-9a-fA-F:]+)\](?::([0-9]+))?$', s)
    if match: # ipv6
        host = match.group(1)
        port = match.group(2)
@@ -84,17 +102,42 @@ def parse_spec(s, defaultport):
        (host,_,port) = s.partition(':')

    if not port:
-        port = defaultport
+        port = 0
    else:
        port = int(port)

-    host = name_to_ipv6(host)
+    host = name_to_bip155(host)

-    return (host,port)
+    if host[0] == BIP155Network.TORV2:
+        return None  # TORV2 is no longer supported, so we ignore it
+    else:
+        return host + (port, )

-def process_nodes(g, f, structname, defaultport):
-    g.write('static SeedSpec6 %s[] = {\n' % structname)
-    first = True
+def ser_compact_size(l):
+    r = b""
+    if l < 253:
+        r = struct.pack("B", l)
+    elif l < 0x10000:
+        r = struct.pack("<BH", 253, l)
+    elif l < 0x100000000:
+        r = struct.pack("<BI", 254, l)
+    else:
+        r = struct.pack("<BQ", 255, l)
+    return r
+
+def bip155_serialize(spec):
+    '''
+    Serialize (networkID, addr, port) tuple to BIP155 binary format.
+    '''
+    r = b""
+    r += struct.pack('B', spec[0].value)
+    r += ser_compact_size(len(spec[1]))
+    r += spec[1]
+    r += struct.pack('>H', spec[2])
+    return r
+
+def process_nodes(g, f, structname):
+    g.write('static const uint8_t %s[] = {\n' % structname)
    for line in f:
        comment = line.find('#')
        if comment != -1:
@@ -102,37 +145,39 @@ def process_nodes(g, f, structname, defaultport):
        line = line.strip()
        if not line:
            continue
-        if not first:
-            g.write(',\n')
-        first = False

-        (host,port) = parse_spec(line, defaultport)
-        hoststr = ','.join(('0x%02x' % b) for b in host)
-        g.write('    {{%s}, %i}' % (hoststr, port))
-    g.write('\n};\n')
+        spec = parse_spec(line)
+        if spec is None:  # ignore this entry (e.g. no longer supported addresses like TORV2)
+            continue
+        blob = bip155_serialize(spec)
+        hoststr = ','.join(('0x%02x' % b) for b in blob)
+        g.write(f'    {hoststr}, // {line}\n')
+    g.write('};\n')

 def main():
    if len(sys.argv)<2:
        print(('Usage: %s <path_to_nodes_txt>' % sys.argv[0]), file=sys.stderr)
-        exit(1)
+        sys.exit(1)
    g = sys.stdout
    indir = sys.argv[1]
-    g.write('#ifndef BITCOIN_CHAINPARAMSSEEDS_H\n')
-    g.write('#define BITCOIN_CHAINPARAMSSEEDS_H\n')
-    g.write('/**\n')
-    g.write(' * List of fixed seed nodes for the bitcoin network\n')
-    g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n')
-    g.write(' *\n')
-    g.write(' * Each line contains a 16-byte IPv6 address and a port.\n')
-    g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n')
-    g.write(' */\n')
-    with open(os.path.join(indir,'nodes_main.txt'),'r') as f:
-        process_nodes(g, f, 'pnSeed6_main', 8233)
+    g.write('// Copyright (c) 2016-2023 The Hush developers\n')
+    g.write('// Distributed under the GPLv3 software license, see the accompanying\n')
+    g.write('// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html\n')
+    g.write('// THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY\n')
+    g.write('// Instead, update contrib/seeds/nodes_main.txt then run\n')
+    g.write('//    ./contrib/seeds/generate-seeds.py contrib/seeds > src/chainparamsseeds.h\n')
+    g.write('// OR run: make seeds\n')
+    g.write('#ifndef HUSH_CHAINPARAMSSEEDS_H\n')
+    g.write('#define HUSH_CHAINPARAMSSEEDS_H\n')
+    g.write('// List of fixed seed nodes for the Hush network\n')
+    g.write('// Each line contains a BIP155 serialized address.\n')
+    g.write('//\n')
+    with open(os.path.join(indir,'nodes_main.txt'), 'r', encoding="utf8") as f:
+        process_nodes(g, f, 'chainparams_seed_main')
    g.write('\n')
-    with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
-        process_nodes(g, f, 'pnSeed6_test', 18233)
-    g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n')
-            
+    with open(os.path.join(indir,'nodes_test.txt'), 'r', encoding="utf8") as f:
+        process_nodes(g, f, 'chainparams_seed_test')
+    g.write('#endif // HUSH_CHAINPARAMSSEEDS_H\n')
+
 if __name__ == '__main__':
    main()
-
--- a/contrib/seeds/nodes_main.txt
+++ b/contrib/seeds/nodes_main.txt
@@ -1,6 +1,32 @@
-185.25.48.236:27485
-185.25.48.236:27487
-185.64.105.111:27485
-185.64.105.111:27487
-185.25.48.72:27485
-185.25.48.72:27487                                                                                                    
+# node1.hush.land
+185.241.61.43
+
+# node2.hush.land
+87.251.76.166
+
+# node3.hush.land
+45.82.68.233
+
+# node4.hush.land
+87.251.76.33
+
+# node2.hush.is
+137.74.4.198
+
+# lite.hushpool.is
+149.28.102.219
+
+# wtfistheinternet.hush.is
+107.174.70.251
+
+# torv3
+56wqzfj6mhxgsv3h3nh3pdocguogxfxud55libqjhjsdh5alfsko2iqd.onion
+hushv3h6mbxd2pptj42reko3jcexcgnz5zvp3mqcu6myto3jhhn4yzyd.onion
+hushv3xvheqh42ms3ld2nh555muscietkib7gycb7s4psbrjsysfywqd.onion
+
+# ipv6
+2a0c:b641:6f1:34::2
+2a0c:b641:6f1:c::2
+
+# i2p
+iljqq7nnmw2ij2ezl334cerwwmgzmmbmoc3n4saditd2xhi3xohq.b32.i2p
--- a/contrib/seeds/nodes_test.txt
+++ b/contrib/seeds/nodes_test.txt
@@ -1,11 +1,5 @@
 # List of fixed seed nodes for testnet
+# note: File must be non-empty to compile
+1.2.3.4

 # Onion nodes
-thfsmmn2jbitcoin.onion
-it2pj4f7657g3rhi.onion
-nkf5e6b7pl4jfd4a.onion
-4zhkir2ofl7orfom.onion
-t6xj6wilh4ytvcs7.onion
-i6y6ivorwakd7nw3.onion
-ubqj4rsu3nqtxmtp.onion
-
--- a/contrib/snapshot/airdrop_hush3.sh
+++ b/contrib/snapshot/airdrop_hush3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This code inspired by and dedicated to Decker

 echo "Airdropping funds to HUSH3, hold onto your butts..."
--- a/contrib/snapshot/testnet_airdrop_hush3.sh
+++ b/contrib/snapshot/testnet_airdrop_hush3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This code inspired by and dedicated to Decker

 echo "Airdropping funds to HUSH3, hold onto your butts..."
--- a/contrib/tidy_datadir.sh
+++ b/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
--- a/contrib/verify-commits/gpg.sh
+++ b/contrib/verify-commits/gpg.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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)
--- a/contrib/verify-commits/pre-push-hook.sh
+++ b/contrib/verify-commits/pre-push-hook.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
-# Copyright (c) 2016-2021 The Hush developers
+#!/usr/bin/env bash
+# Copyright (c) 2016-2023 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
--- a/contrib/verify-commits/verify-commits.sh
+++ b/contrib/verify-commits/verify-commits.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
-# Copyright (c) 2016-2021 The Hush developers
+#!/usr/bin/env bash
+# Copyright (c) 2016-2023 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

--- a/contrib/verifysfbinaries/verify.sh
+++ b/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
--- a/contrib/zmq/zmq_sub.py
+++ b/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()
--- a/depends/Makefile
+++ b/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),)
--- a/depends/builders/freebsd.mk
+++ b/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
--- a/depends/funcs.mk
+++ b/depends/funcs.mk
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/depends/hosts/darwin.mk
+++ b/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
--- a/depends/hosts/freebsd.mk
+++ b/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
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -1,9 +1,10 @@
 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
+$(package)_patches=fix-Solaris.patch

 define $(package)_set_vars
 $(package)_config_opts_release=variant=release
@@ -27,7 +28,8 @@ endef


 define $(package)_preprocess_cmds
-  echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
+  echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam&& \
+  patch -p1 < $($(package)_patch_dir)/fix-Solaris.patch
 endef

 define $(package)_config_cmds
@@ -36,16 +38,16 @@ endef

 ifeq ($(host_os),linux)
 define $(package)_build_cmds
-  ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) cxxflags=-std=c++11 stage
+  ./b2 -d2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) cxxflags=-std=c++11 stage
 endef
 define $(package)_stage_cmds
-  ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) cxxflags=-std=c++11 install
+  ./b2 -d0 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) cxxflags=-std=c++11 install
 endef
 else
 define $(package)_build_cmds
-  ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage
+  ./b2 -d2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage
 endef
 define $(package)_stage_cmds
-  ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install
+  ./b2 -d0 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install
 endef
 endif
--- a/depends/packages/libcurl.mk
+++ b/depends/packages/libcurl.mk
@@ -1,9 +1,9 @@
 package=libcurl
-$(package)_version=7.67.0
+$(package)_version=7.77.0
 $(package)_dependencies=wolfssl
 $(package)_download_path=https://curl.haxx.se/download
 $(package)_file_name=curl-$($(package)_version).tar.gz
-$(package)_sha256_hash=52af3361cf806330b88b4fe6f483b6844209d47ae196ac46da4de59bb361ab02
+$(package)_sha256_hash=b0a3428acb60fa59044c4d0baae4e4fc09ae9af1d8a3aa84b2e3fbcd99841f77
 $(package)_config_opts_linux=--disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix) --host=$(host)
 $(package)_config_opts_mingw32=--enable-mingw --disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix) --host=x86_64-w64-mingw32
 $(package)_config_opts_darwin=--disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix)
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -4,8 +4,11 @@ $(package)_download_path=https://github.com/libevent/libevent/archive
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_download_file=release-$($(package)_version)-stable.tar.gz
 $(package)_sha256_hash=316ddb401745ac5d222d7c529ef1eada12f58f6376a66c1118eee803cb70f83d
+$(package)_patches=detect-arch4random_addrandom.patch detect-arch4random_addrandom-fix.patch

 define $(package)_preprocess_cmds
+  patch -p1 <$($(package)_patch_dir)/detect-arch4random_addrandom.patch && \
+  patch -p1 <$($(package)_patch_dir)/detect-arch4random_addrandom-fix.patch && \
  ./autogen.sh
 endef

--- a/depends/packages/libgmp.mk
+++ b/depends/packages/libgmp.mk
@@ -9,12 +9,11 @@ $(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)_file_name=$(package)-$($(package)_git_commit).tar.gz
-$(package)_download_file=$($(package)_git_commit).tar.gz
-$(package)_sha256_hash=59b2c2b5d58fdf5943bfde1fa709e9eb53e7e072c9699d28dc1c2cbb3c8cc32c
-$(package)_git_commit=aece03c7b6967f91f3efdac8c673f55adff53ab1
-$(package)_dependencies=
+$(package)_version=6.1.1
+$(package)_download_path=https://git.hush.is/attachments
+$(package)_file_name=d613c855-cd92-4efb-b893-658496852019
+$(package)_download_file=d613c855-cd92-4efb-b893-658496852019
+$(package)_sha256_hash=a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6
 $(package)_config_opts=--enable-cxx --disable-shared
 else
 $(package)_version=6.1.1
--- a/depends/packages/libsodium.mk
+++ b/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)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_download_path=https://git.hush.is/attachments
+$(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=
--- a/depends/packages/packages.mk
+++ b/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
--- a/depends/packages/rust.mk
+++ b/depends/packages/rust.mk
@@ -46,12 +46,12 @@ define $(package)_extract_cmds
 endef

 define $(package)_stage_cmds
-  bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig && \
-  ../$(canonical_host)/install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig
+  bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig --without=rust-docs && \
+  ../$(canonical_host)/install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig --without=rust-docs
 endef
 else

 define $(package)_stage_cmds
-  bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig
+  bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig --without=rust-docs
 endef
 endif
--- a/depends/packages/utfcpp.mk
+++ b/depends/packages/utfcpp.mk
@@ -1,7 +1,7 @@
 $(package)_version=3.1
-$(package)_download_path=https://github.com/MyHush/$(package)/archive/
-$(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_download_file=v$($(package)_version).tar.gz
+$(package)_download_path=https://git.hush.is/attachments
+$(package)_file_name=11822fe4-3846-4ce4-9c84-ba0877a7b186
+$(package)_download_file=11822fe4-3846-4ce4-9c84-ba0877a7b186
 $(package)_sha256_hash=ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096

 define $(package)_stage_cmds
--- a/depends/packages/zeromq.mk
+++ b/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
--- a/depends/patches/boost/fix-Solaris.patch
+++ b/depends/patches/boost/fix-Solaris.patch
@@ -0,0 +1,23 @@
+From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
+From: Rob Boehne <robb@datalogics.com>
+Date: Wed, 20 Nov 2019 11:25:20 -0600
+Subject: [PATCH] Revert change to elide a warning that caused Solaris builds to fail.
+
+---
+ boost/thread/pthread/thread_data.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boost/thread/pthread/thread_data.hpp b/boost/thread/pthread/thread_data.hpp
+index aefbeb43c..bc9b1367a 100644
+--- a/boost/thread/pthread/thread_data.hpp
+++ b/boost/thread/pthread/thread_data.hpp
+@@ -57,7 +57,7 @@ namespace boost
+ #else
+           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
+ #endif
+-#if PTHREAD_STACK_MIN > 0
+-          if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
+#ifdef PTHREAD_STACK_MIN
+          if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
+ #endif
+           size = ((size+page_size-1)/page_size)*page_size;
--- a/depends/patches/libevent/detect-arch4random_addrandom-fix.patch
+++ b/depends/patches/libevent/detect-arch4random_addrandom-fix.patch
@@ -0,0 +1,43 @@
+From 266f43af7798befa3d27bfabaa9ae699259c3924 Mon Sep 17 00:00:00 2001
+From: Azat Khuzhin <a3at.mail@gmail.com>
+Date: Mon, 27 Mar 2017 15:50:23 +0300
+Subject: [PATCH] Fix arc4random_addrandom() detecting and fallback
+ (regression)
+
+But this is kind of hot-fix, we definitelly need more sane arc4random
+compat layer.
+
+Fixes: #488
+Introduced-in: 6541168 ("Detect arch4random_addrandom() existence")
+---
+ event-config.h.cmake  | 3 +++
+ include/event2/util.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/event-config.h.cmake b/event-config.h.cmake
+index b7f0be57c..5c233a3d9 100644
+--- a/event-config.h.cmake
+++ b/event-config.h.cmake
+@@ -53,6 +53,9 @@
+ /* Define to 1 if you have the `arc4random_buf' function. */
+ #cmakedefine EVENT__HAVE_ARC4RANDOM_BUF 1
+ 
+/* Define to 1 if you have the `arc4random_addrandom' function. */
+#cmakedefine EVENT__HAVE_ARC4RANDOM_ADDRANDOM 1
+
+ /* Define if clock_gettime is available in libc */
+ #cmakedefine EVENT__DNS_USE_CPU_CLOCK_FOR_ID 1
+ 
+diff --git a/include/event2/util.h b/include/event2/util.h
+index c4af2bd60..ca4048944 100644
+--- a/include/event2/util.h
+++ b/include/event2/util.h
+@@ -842,7 +842,7 @@ int evutil_secure_rng_init(void);
+ EVENT2_EXPORT_SYMBOL
+ int evutil_secure_rng_set_urandom_device_file(char *fname);
+ 
+-#ifdef EVENT__HAVE_ARC4RANDOM_ADDRANDOM
+#if !defined(EVENT__HAVE_ARC4RANDOM) || defined(EVENT__HAVE_ARC4RANDOM_ADDRANDOM)
+ /** Seed the random number generator with extra random bytes.
+ 
+     You should almost never need to call this function; it should be
--- a/depends/patches/libevent/detect-arch4random_addrandom.patch
+++ b/depends/patches/libevent/detect-arch4random_addrandom.patch
@@ -0,0 +1,77 @@
+From 6541168d7037457b8e5c51cc354f11bd94e618b6 Mon Sep 17 00:00:00 2001
+From: Marek Sebera <marek.sebera@gmail.com>
+Date: Mon, 6 Mar 2017 00:55:16 +0300
+Subject: [PATCH] Detect arch4random_addrandom() existence
+
+Refs: #370
+Refs: #475
+---
+ CMakeLists.txt        | 1 +
+ configure.ac          | 1 +
+ evutil_rand.c         | 2 ++
+ include/event2/util.h | 2 ++
+ 4 files changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a861e7d96..f609d02d0 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -338,6 +338,7 @@ CHECK_FUNCTION_EXISTS_EX(sysctl EVENT__HAVE_SYSCTL)
+ CHECK_FUNCTION_EXISTS_EX(accept4 EVENT__HAVE_ACCEPT4)
+ CHECK_FUNCTION_EXISTS_EX(arc4random EVENT__HAVE_ARC4RANDOM)
+ CHECK_FUNCTION_EXISTS_EX(arc4random_buf EVENT__HAVE_ARC4RANDOM_BUF)
+CHECK_FUNCTION_EXISTS_EX(arc4random_addrandom EVENT__HAVE_ARC4RANDOM_ADDRANDOM)
+ CHECK_FUNCTION_EXISTS_EX(epoll_create1 EVENT__HAVE_EPOLL_CREATE1)
+ CHECK_FUNCTION_EXISTS_EX(getegid EVENT__HAVE_GETEGID)
+ CHECK_FUNCTION_EXISTS_EX(geteuid EVENT__HAVE_GETEUID)
+diff --git a/configure.ac b/configure.ac
+index a127bbc91..e73c29b14 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -342,6 +342,7 @@ AC_CHECK_FUNCS([ \
+   accept4 \
+   arc4random \
+   arc4random_buf \
+  arc4random_addrandom \
+   eventfd \
+   epoll_create1 \
+   fcntl \
+diff --git a/evutil_rand.c b/evutil_rand.c
+index 046a14b07..4be0b1c5e 100644
+--- a/evutil_rand.c
+++ b/evutil_rand.c
+@@ -192,12 +192,14 @@ evutil_secure_rng_get_bytes(void *buf, size_t n)
+ 	ev_arc4random_buf(buf, n);
+ }
+ 
+#if !defined(EVENT__HAVE_ARC4RANDOM) || defined(EVENT__HAVE_ARC4RANDOM_ADDRANDOM)
+ void
+ evutil_secure_rng_add_bytes(const char *buf, size_t n)
+ {
+ 	arc4random_addrandom((unsigned char*)buf,
+ 	    n>(size_t)INT_MAX ? INT_MAX : (int)n);
+ }
+#endif
+ 
+ void
+ evutil_free_secure_rng_globals_(void)
+diff --git a/include/event2/util.h b/include/event2/util.h
+index dd4bbb69d..c4af2bd60 100644
+--- a/include/event2/util.h
+++ b/include/event2/util.h
+@@ -842,6 +842,7 @@ int evutil_secure_rng_init(void);
+ EVENT2_EXPORT_SYMBOL
+ int evutil_secure_rng_set_urandom_device_file(char *fname);
+ 
+#ifdef EVENT__HAVE_ARC4RANDOM_ADDRANDOM
+ /** Seed the random number generator with extra random bytes.
+ 
+     You should almost never need to call this function; it should be
+@@ -858,6 +859,7 @@ int evutil_secure_rng_set_urandom_device_file(char *fname);
+  */
+ EVENT2_EXPORT_SYMBOL
+ void evutil_secure_rng_add_bytes(const char *dat, size_t datlen);
+#endif
+ 
+ #ifdef __cplusplus
+ }
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -45,12 +45,7 @@ The jq manual can be found here: https://stedolan.github.io/jq/manual/

 # Making a new release of Hush

-  * Update version in configure.ac and src/clientversion.h
-  * Run ./contrib/devtools/gen-manpages.sh, commit + push results
-  * Update checkpoints
-  * Update protocol version in src/version.h if necessary
-  * Make Gitea release
-  * Make Git Tag (Gitea can do this)
+See doc/release-process.md for details.


 # Testing a Branch
--- a/doc/hsc.md
+++ b/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
--- a/doc/i2p.md
+++ b/doc/i2p.md
@@ -0,0 +1,161 @@
+# I2P support in Hush
+
+It is possible to run a Hush or HSC full node as an
+[I2P (Invisible Internet Project)](https://en.wikipedia.org/wiki/I2P)
+service and connect to such services.
+
+This [glossary](https://geti2p.net/en/about/glossary) may be useful to get
+started with I2P terminology.
+
+## Run with an I2P router (proxy)
+
+A running I2P router (proxy) with [SAM](https://geti2p.net/en/docs/api/samv3)
+enabled is required. Options include:
+
+- [i2prouter (I2P Router)](https://geti2p.net), the official implementation in
+  Java
+- [i2pd (I2P Daemon)](https://github.com/PurpleI2P/i2pd)
+  ([documentation](https://i2pd.readthedocs.io/en/latest)), a lighter
+  alternative in C++ (successfully tested with version 2.23 and up; version 2.36
+  or later recommended)
+- [i2p-zero](https://github.com/i2p-zero/i2p-zero)
+- [other alternatives](https://en.wikipedia.org/wiki/I2P#Routers)
+
+Note the IP address and port the SAM proxy is listening to; usually, it is
+`127.0.0.1:7656`.
+
+Once an I2P router with SAM enabled is up and running, use the following
+configuration options:
+
+```
+-i2psam=<ip:port>
+     I2P SAM proxy to reach I2P peers and accept I2P connections (default:
+     none)
+
+-i2pacceptincoming
+     If set and -i2psam is also set then incoming I2P connections are
+     accepted via the SAM proxy. If this is not set but -i2psam is set
+     then only outgoing connections will be made to the I2P network.
+     Ignored if -i2psam is not set. Listening for incoming I2P
+     connections is done through the SAM proxy, not by binding to a
+     local address and port (default: 1)
+```
+
+In a typical situation, this suffices:
+
+```
+hushd -i2psam=127.0.0.1:7656
+```
+
+The first time hushd connects to the I2P router, if
+`-i2pacceptincoming=1`, then it will automatically generate a persistent I2P
+address and its corresponding private key. The private key will be saved in a
+file named `i2p_private_key` in the Hush data directory. The persistent
+I2P address is used for accepting incoming connections and for making outgoing
+connections if `-i2pacceptincoming=1`. If `-i2pacceptincoming=0` then only
+outbound I2P connections are made and a different transient I2P address is used
+for each connection to improve privacy.
+
+## Persistent vs transient I2P addresses
+
+In I2P connections, the connection receiver sees the I2P address of the
+connection initiator. This is unlike the Tor network where the recipient does
+not know who is connecting to them and can't tell if two connections are from
+the same peer or not.
+
+If an I2P node is not accepting incoming connections, then Hush uses
+random, one-time, transient I2P addresses for itself for outbound connections
+to make it harder to discriminate, fingerprint or analyze it based on its I2P
+address.
+
+## Additional configuration options related to I2P
+
+```
+-debug=i2p
+```
+
+Set the `debug=i2p` config logging option to see additional information in the
+debug log about your I2P configuration and connections. Run `hush-cli help
+logging` for more information.
+
+```
+-onlynet=i2p
+```
+
+Make automatic outbound connections only to I2P addresses. Inbound and manual
+connections are not affected by this option. It can be specified multiple times
+to allow multiple networks, e.g. onlynet=onion, onlynet=i2p.
+
+I2P support was added to Hush in version 3.9.3 and there may be fewer I2P
+peers than Tor or IP ones. Therefore, using I2P alone without other networks may
+make a node more susceptible to [Sybil
+attacks](https://en.bitcoin.it/wiki/Weaknesses#Sybil_attack). You can use
+`hush-cli -addrinfo` to see the number of I2P addresses known to your node.
+
+Another consideration with `onlynet=i2p` is that the initial blocks download
+phase when syncing up a new node can be very slow. This phase can be sped up by
+using other networks, for instance `onlynet=onion`, at the same time.
+
+In general, a node can be run with both onion and I2P hidden services (or
+any/all of IPv4/IPv6/onion/I2P/CJDNS), which can provide a potential fallback if
+one of the networks has issues.
+
+## I2P-related information
+
+There are several ways to see your I2P address if accepting
+incoming I2P connections (`-i2pacceptincoming`):
+- in the "Local addresses" output of CLI `-netinfo`
+- in the "localaddresses" output of RPC `getnetworkinfo`
+- in the debug log (grep for `AddLocal`; the I2P address ends in `.b32.i2p`)
+
+To see which I2P peers your node is connected to, use `hush-cli -netinfo 4`
+or the `getpeerinfo` RPC (e.g. `hush-cli getpeerinfo`).
+
+To see which I2P addresses your node knows, use the `getnodeaddresses 0 i2p`
+RPC.
+
+## Compatibility
+
+Hush uses the [SAM v3.1](https://geti2p.net/en/docs/api/samv3) protocol
+to connect to the I2P network. Any I2P router that supports it can be used.
+
+## Ports in I2P and Hush
+
+Hush uses the [SAM v3.1](https://geti2p.net/en/docs/api/samv3)
+protocol. One particularity of SAM v3.1 is that it does not support ports,
+unlike newer versions of SAM (v3.2 and up) that do support them and default the
+port numbers to 0. From the point of view of peers that use newer versions of
+SAM or other protocols that support ports, a SAM v3.1 peer is connecting to them
+on port 0, from source port 0.
+
+To allow future upgrades to newer versions of SAM, Hush sets its
+listening port to 0 when listening for incoming I2P connections and advertises
+its own I2P address with port 0. Furthermore, it will not attempt to connect to
+I2P addresses with a non-zero port number because with SAM v3.1 the destination
+port (`TO_PORT`) is always set to 0 and is not in the control of Hush.
+
+## Bandwidth
+
+I2P routers may route a large amount of general network traffic with their
+default settings. Check your router's configuration to limit the amount of this
+traffic relayed, if desired.
+
+With `i2pd`, the amount of bandwidth being shared with the wider network can be
+adjusted with the `bandwidth`, `share` and `transittunnels` options in your
+`i2pd.conf` file. For example, to limit total I2P traffic to 256KB/s and share
+50% of this limit for a maximum of 20 transit tunnels:
+
+```
+bandwidth = 256
+share = 50
+
+[limits]
+transittunnels = 20
+```
+
+If you prefer not to relay any public I2P traffic and only permit I2P traffic
+from programs which are connecting via the SAM proxy, e.g. Hush, you
+can set the `notransit` option to `true`.
+
+Similar bandwidth configuration options for the Java I2P router can be found in
+`http://127.0.0.1:7657/config` under the "Bandwidth" tab.
--- a/doc/man/hush-cli.1
+++ b/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" "January 2022" "hush-cli v3.9.1" "User Commands"
+.TH HUSH-CLI "1" "February 2023" "hush-cli v3.9.3" "User Commands"
 .SH NAME
-hush-cli \- manual page for hush-cli v3.9.1
+hush-cli \- manual page for hush-cli v3.9.3
 .SH DESCRIPTION
-Hush RPC client version v3.9.1\-804a4abbe\-dirty
+Hush RPC client version v3.9.3\-1313d39a7
 .PP
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://hush.is/security/>.
@@ -29,7 +29,7 @@ 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
@@ -38,8 +38,8 @@ Use the test network
 \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.
+can be solved instantly. This is intended for regression testing
+tools and app development.
 .HP
 \fB\-rpcconnect=\fR<ip>
 .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-2023 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!!!!!
--- a/doc/man/hush-tx.1
+++ b/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" "January 2022" "hush-tx v3.9.1" "User Commands"
+.TH HUSH-TX "1" "February 2023" "hush-tx v3.9.3" "User Commands"
 .SH NAME
-hush-tx \- manual page for hush-tx v3.9.1
+hush-tx \- manual page for hush-tx v3.9.3
 .SH DESCRIPTION
-hush\-tx utility version v3.9.1\-804a4abbe\-dirty
+hush\-tx utility version v3.9.3\-1313d39a7
 .SS "Usage:"
 .TP
 hush\-tx [options] <hex\-tx> [commands]
@@ -72,7 +72,8 @@ 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.
+signrawtransaction docs for format of sighash flags, JSON
+objects.
 .PP
 Register Commands:
 .IP
@@ -88,9 +89,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-2023 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!!!!!
--- a/doc/man/hushd.1
+++ b/doc/man/hushd.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH HUSHD "1" "January 2022" "hushd v3.9.1" "User Commands"
+.TH HUSHD "1" "February 2023" "hushd v3.9.3" "User Commands"
 .SH NAME
-hushd \- manual page for hushd v3.9.1
+hushd \- manual page for hushd v3.9.3
 .SH DESCRIPTION
-Hush Daemon version v3.9.1\-804a4abbe\-dirty
+Hush Daemon version v3.9.3\-1313d39a7
 .PP
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://hush.is/security/>.
@@ -17,11 +17,6 @@ Start a Hush Daemon
 .IP
 This help message
 .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
@@ -49,7 +44,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
@@ -63,14 +58,23 @@ Set database cache size in megabytes (4 to 16384, default: 512)
 .IP
 Imports blocks from external blk000??.dat file on startup
 .HP
+\fB\-maxdebugfilesize=\fR<n>
+.IP
+Set the max size of the debug.log file (default: 15)
+.HP
 \fB\-maxorphantx=\fR<n>
 .IP
 Keep at most <n> unconnectable transactions in memory (default: 100)
 .HP
+\fB\-maxreorg=\fR<n>
+.IP
+Specify the maximum length of a blockchain re\-organization
+.HP
 \fB\-mempooltxinputlimit=\fR<n>
 .IP
 [DEPRECATED/IGNORED] Set the maximum number of transparent inputs in a
-transaction that the mempool will accept (default: 0 = no limit applied)
+transaction that the mempool will accept (default: 0 = no limit
+applied)
 .HP
 \fB\-par=\fR<n>
 .IP
@@ -89,10 +93,10 @@ transaction id)
 \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)
+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
@@ -142,8 +146,8 @@ Add a node to connect to and attempt to keep the connection open
 \fB\-asmap=\fR<file>
 .IP
 Specify ASN mapping used for bucketing of the peers (default:
-asmap.dat). Relative paths will be prefixed by the net\-specific datadir
-location.
+asmap.dat). Relative paths will be prefixed by the net\-specific
+datadir location.
 .HP
 \fB\-banscore=\fR<n>
 .IP
@@ -191,7 +195,7 @@ Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\
 .HP
 \fB\-listenonion\fR
 .IP
-Automatically create Tor hidden service (default: 0)
+Automatically create Tor hidden service (default: 1)
 .HP
 \fB\-maxconnections=\fR<n>
 .IP
@@ -210,9 +214,36 @@ Maximum per\-connection send buffer, <n>*1000 bytes (default: 1000)
 Use separate SOCKS5 proxy to reach peers via Tor hidden services
 (default: \fB\-proxy\fR)
 .HP
+\fB\-nspv_msg\fR
+.IP
+Enable NSPV messages processing (default: true when \fB\-ac_private\fR=\fI\,1\/\fR,
+otherwise false)
+.HP
+\fB\-i2psam=\fR<ip:port>
+.IP
+I2P SAM proxy to reach I2P peers and accept I2P connections (default:
+none)
+.HP
+\fB\-i2pacceptincoming\fR
+.IP
+If set and \fB\-i2psam\fR is also set then incoming I2P connections are
+accepted via the SAM proxy. If this is not set but \fB\-i2psam\fR is set
+then only outgoing connections will be made to the I2P network.
+Ignored if \fB\-i2psam\fR is not set. Listening for incoming I2P
+connections is done through the SAM proxy, not by binding to a
+local address and port (default: 1)
+.HP
 \fB\-onlynet=\fR<net>
 .IP
-Only connect to nodes in network <net> (ipv4, ipv6 or onion)
+Only connect to nodes in network <net> (ipv4, ipv6, onion or i2p)
+.HP
+\fB\-disableipv4\fR
+.IP
+Disable Ipv4 network connections (default: 0)
+.HP
+\fB\-disableipv6\fR
+.IP
+Disable Ipv6 network connections (default: 0)
 .HP
 \fB\-permitbaremultisig\fR
 .IP
@@ -242,7 +273,7 @@ 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)
+Specify connection timeout in milliseconds (minimum: 1, default: 60000)
 .HP
 \fB\-torcontrol=\fR<ip>:<port>
 .IP
@@ -287,9 +318,9 @@ Bind to given address and allowlist peers connecting to it. Use
 \fB\-allowlist=\fR<netmask>
 .IP
 Allowlist peers connecting from the given netmask or IP address. Can be
-specified multiple times. Allowlisted 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
+specified multiple times. Allowlisted 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
@@ -314,6 +345,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
@@ -401,47 +461,32 @@ by TxID)
 \fB\-allowlistaddress=\fR<Raddress>
 .IP
 Enable the wallet filter for notary nodes and add one Raddress to the
-allowlist of the wallet filter. If \fB\-allowlistaddress=\fR is used, then the
-wallet filter is automatically activated. Several Raddresses can be
-defined using several \fB\-allowlistaddress=\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\-allowlistaddress=\fR this option is mostly for Notary Nodes).
+allowlist of the wallet filter. If \fB\-allowlistaddress=\fR is used,
+then the wallet filter is automatically activated. Several
+Raddresses can be defined using several \fB\-allowlistaddress=\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\-allowlistaddress=\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>
+account owner and payment request information, 2 = drop tx meta
+data)
 .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, deletetx, estimatefee, http, libevent, lock, mempool, net,
-tls, partitioncheck, pow, proxy, prune, rand, reindex, rpc, selectcoins,
-stratum, tor, zmq, zrpc, zrpcunsafe (implies zrpc).
+optional). If <category> is not supplied or if <category> = 1,
+output all debugging information. <category> can be: addrman,
+bench, coindb, db, deletetx, estimatefee, http, libevent, lock,
+mempool, net, tls, partitioncheck, pow, proxy, prune, rand,
+randomx, reindex, rpc, selectcoins, stratum, tor, zrpc,
+zrpcunsafe (implies zrpc).
 .HP
 \fB\-experimentalfeatures\fR
 .IP
@@ -539,8 +584,8 @@ Accept public REST requests (default: 0)
 \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)
+[host]:port notation for IPv6. This option can be specified
+multiple times (default: bind to all interfaces)
 .HP
 \fB\-rpcuser=\fR<user>
 .IP
@@ -557,9 +602,9 @@ Listen for JSON\-RPC connections on <port> (default: 0 or testnet: 10000)
 \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
+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
@@ -595,8 +640,8 @@ Mining address to use when special address of 'x' is sent by miner
 \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)
+[host]:port notation for IPv6. This option can be specified
+multiple times (default: bind to all interfaces)
 .HP
 \fB\-stratumport=\fR<port>
 .IP
@@ -606,15 +651,16 @@ Listen for Stratum work requests on <port> (default: 19031 or testnet:
 \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
+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 (200,9)
+Choose PoW mining algorithm, either 'equihash' or 'randomx'. default is
+Equihash (200,9)
 .HP
 \fB\-ac_blocktime\fR
 .IP
@@ -688,6 +734,15 @@ Public key for receiving payments on the network
 .IP
 Transparent transactions only, default 0
 .HP
+\fB\-ac_randomx_interval\fR
+.IP
+Controls how often the RandomX key block will change, default is 1024
+.HP
+\fB\-ac_randomx_lag\fR
+.IP
+Sets the number of RandomX blocks to wait before updating the key block,
+default is 64
+.HP
 \fB\-ac_reward\fR
 .IP
 Block reward in satoshis, default is 0
@@ -702,7 +757,7 @@ P2SH/multisig address to receive founders rewards
 .HP
 \fB\-ac_supply\fR
 .IP
-Starting supply, default is 0
+Starting supply, default is 10
 .HP
 \fB\-ac_txpow\fR
 .IP
@@ -712,9 +767,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-2023 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!!!!!
--- a/doc/randomx.md
+++ b/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.
+
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -1,17 +1,57 @@
 # 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 master
+git merge --no-ff dev # using the default commit message is fine
+git push origin master
+git checkout dev
+git merge master
+git push origin dev
+```
+
+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
+    * All releases with a large change to the networking (P2P) layer 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

@@ -20,5 +60,63 @@ Install deps on Linux:
 	apt-get install help2man debchange

 ## Release process
+ - If new seeds are being added or seeds are changing:
+   - Edit contrib/seeds/nodes_main.txt
+   - Run "make seeds"
+   - Commit the result
+ - 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 checkpoint 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
+   - 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. Example: `./util/update-copyrights.h 2022 2023`
+ - 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.
--- a/doc/relnotes/README.md
+++ b/doc/relnotes/README.md
@@ -10,6 +10,68 @@ 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.9.3 "Lateral Larvacean"
+
+```
+1012 files changed, 36253 insertions(+), 5507 deletions(-)
+```
+
+This is an OPTIONAL release. It is recommended for exchanges, solo miners and mining pools to update to this release.
+
+  * Many RandomX mining fixes and improvements
+    * Difficulty bug affecting DRAGONX has been fixed
+    * RandomX mining hashrate increase of about 60X
+    * Optimized memory usage of RandomX mining
+  * This release adds Tor v3 and i2p support (BIP155 also known as addrv2)
+    * Basic usage is `hushd -proxy=127.0.0.1:9050` for using a local Tor proxy.
+    * Use port 9150 if you are using Tor Browser. See docs/tor.md for details
+    * New CLI args: `-i2psam=<ip:port>` and `-i2pacceptincoming` . See docs/i2p.md for more info
+    * Tor and i2p seeds have been added
+    * The format of peers.dat has changed. On first startup with this code there will be a short delay of a few minutes while new nodes are found and peers.dat is populated in it's new format.
+  * New RPCs:
+    * getrescaninfo - Says if the node is rescanning with additional info about progress
+    * abortrescan - stop rescanning if a node is currently rescanning
+
+
+# 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
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -1,154 +1,225 @@
-# Warning
+# Tor

- Do not assume Tor support works perfectly in Hush; better Tor support is currently being worked on.
-
-# Hush + Tor
-
-It is possible to run Hush as a Tor hidden service, and connect to such services.
+It is possible to run Hush as a Tor onion service, and connect to such services.

 The following directions assume you have a Tor proxy running on port 9050. Many distributions default to having a SOCKS proxy listening on port 9050, but others may not. In particular, the Tor Browser Bundle defaults to listening on port 9150. See [Tor Project FAQ:TBBSocksPort](https://www.torproject.org/docs/faq.html.en#TBBSocksPort) for how to properly
 configure Tor.

+## Compatibility

-1. Run Hush behind a Tor proxy
-------------------------------
+- Starting with version 3.9.3, Hush only supports Tor version 3 hidden
+  services (Tor v3). Tor v2 addresses are ignored by Hush and neither
+  relayed nor stored.

-The first step is running Hush behind a Tor proxy. This will already make all
-outgoing connections be anonymized, but more is possible.
+- Tor removed v2 support beginning with version 0.4.6.

-	-proxy=ip:port  Set the proxy server. If SOCKS5 is selected (default), this proxy
-	                server will be used to try to reach .onion addresses as well.
+## How to see information about your Tor configuration via Hush

-	-onion=ip:port  Set the proxy server to use for Tor hidden services. You do not
-	                need to set this if it's the same as -proxy. You can use -noonion
-	                to explicitly disable access to hidden service.
+There are several ways to see your local onion address in Hush:
+- in the "Local addresses" output of CLI `-netinfo`
+- in the "localaddresses" output of RPC `getnetworkinfo`
+- in the debug log (grep for "AddLocal"; the Tor address ends in `.onion`)

-	-listen         When using -proxy, listening is disabled by default. If you want
-	                to run a hidden service (see next section), you'll need to enable
-	                it explicitly.
+You may set the `-debug=tor` config logging option to have additional
+information in the debug log about your Tor configuration.

-	-connect=X      When behind a Tor proxy, you can specify .onion addresses instead
-	-addnode=X      of IP addresses or hostnames in these parameters. It requires
-	-seednode=X     SOCKS5. In Tor mode, such addresses can also be exchanged with
-	                other P2P nodes.
+CLI `-addrinfo` returns the number of addresses known to your node per
+network. This can be useful to see how many onion peers your node knows,
+e.g. for `-onlynet=onion`.
+
+To fetch a number of onion addresses that your node knows, for example seven
+addresses, use the `getnodeaddresses 7 onion` RPC.
+
+## 1. Run Hush behind a Tor proxy
+
+The first step is running Hush behind a Tor proxy. This will already anonymize all
+outgoing connections, but more is possible.
+
+    -proxy=ip:port  Set the proxy server. If SOCKS5 is selected (default), this proxy
+                    server will be used to try to reach .onion addresses as well.
+                    You need to use -noonion or -onion=0 to explicitly disable
+                    outbound access to onion services.
+
+    -onion=ip:port  Set the proxy server to use for Tor onion services. You do not
+                    need to set this if it's the same as -proxy. You can use -onion=0
+                    to explicitly disable access to onion services.
+                    ------------------------------------------------------------------
+                    Note: Only the -proxy option sets the proxy for DNS requests;
+                    with -onion they will not route over Tor, so use -proxy if you
+                    have privacy concerns.
+                    ------------------------------------------------------------------
+
+    -listen         When using -proxy, listening is disabled by default. If you want
+                    to manually configure an onion service (see section 3), you'll
+                    need to enable it explicitly.
+
+    -connect=X      When behind a Tor proxy, you can specify .onion addresses instead
+    -addnode=X      of IP addresses or hostnames in these parameters. It requires
+    -seednode=X     SOCKS5. In Tor mode, such addresses can also be exchanged with
+                    other P2P nodes.
+
+    -onlynet=onion  Make automatic outbound connections only to .onion addresses.
+                    Inbound and manual connections are not affected by this option.
+                    It can be specified multiple times to allow multiple networks,
+                    e.g. onlynet=onion, onlynet=i2p, onlynet=cjdns.

 In a typical situation, this suffices to run behind a Tor proxy:

-	./hushd -proxy=127.0.0.1:9050
+    ./hushd -proxy=127.0.0.1:9050

-If using the Tor Browser Bundle:
+## 2. Automatically create a Hush onion service

-	./hushd -proxy=127.0.0.1:9150
+Hush makes use of Tor's control socket API to create and destroy
+ephemeral onion services programmatically. This means that if Tor is running and
+proper authentication has been configured, Hush automatically creates an
+onion service to listen on. The goal is to increase the number of available
+onion nodes.
+
+This feature is enabled by default if Hush is listening (`-listen`) and
+it requires a Tor connection to work. It can be explicitly disabled with
+`-listenonion=0`. If it is not disabled, it can be configured using the
+`-torcontrol` and `-torpassword` settings.
+
+To see verbose Tor information in the hushd debug log, pass `-debug=tor`.
+
+### Control Port
+
+You may need to set up the Tor Control Port. On Linux distributions there may be
+some or all of the following settings in `/etc/tor/torrc`, generally commented
+out by default (if not, add them):
+
+```
+ControlPort 9051
+CookieAuthentication 1
+CookieAuthFileGroupReadable 1
+```
+
+Add or uncomment those, save, and restart Tor (usually `systemctl restart tor`
+or `sudo systemctl restart tor` on most systemd-based systems, including recent
+Debian and Ubuntu, or just restart the computer).
+
+On some systems (such as Arch Linux), you may also need to add the following
+line:
+
+```
+DataDirectoryGroupReadable 1
+```
+
+### Authentication
+
+Connecting to Tor's control socket API requires one of two authentication
+methods to be configured: cookie authentication or hushd's `-torpassword`
+configuration option.
+
+#### Cookie authentication
+
+For cookie authentication, the user running hushd must have read access to
+the `CookieAuthFile` specified in the Tor configuration. In some cases this is
+preconfigured and the creation of an onion service is automatic. Don't forget to
+use the `-debug=tor` hushd configuration option to enable Tor debug logging.
+
+If a permissions problem is seen in the debug log, e.g. `tor: Authentication
+cookie /run/tor/control.authcookie could not be opened (check permissions)`, it
+can be resolved by adding both the user running Tor and the user running
+hushd to the same Tor group and setting permissions appropriately.
+
+On Debian-derived systems, the Tor group will likely be `debian-tor` and one way
+to verify could be to list the groups and grep for a "tor" group name:
+
+```
+getent group | cut -d: -f1 | grep -i tor
+```
+
+You can also check the group of the cookie file. On most Linux systems, the Tor
+auth cookie will usually be `/run/tor/control.authcookie`:
+
+```
+TORGROUP=$(stat -c '%G' /run/tor/control.authcookie)
+```
+
+Once you have determined the `${TORGROUP}` and selected the `${USER}` that will
+run hushd, run this as root:
+
+```
+usermod -a -G ${TORGROUP} ${USER}
+```
+
+Then restart the computer (or log out) and log in as the `${USER}` that will run
+hushd.
+
+#### `torpassword` authentication
+
+For the `-torpassword=password` option, the password is the clear text form that
+was used when generating the hashed password for the `HashedControlPassword`
+option in the Tor configuration file.
+
+The hashed password can be obtained with the command `tor --hash-password
+password` (refer to the [Tor Dev
+Manual](https://2019.www.torproject.org/docs/tor-manual.html.en) for more
+details).


+## 3. Manually create a Hush onion service

-2. Run a Hush hidden server
----------------------------
+You can also manually configure your node to be reachable from the Tor network.
+Add these lines to your `/etc/tor/torrc` (or equivalent config file):

-If you configure your Tor system accordingly, it is possible to make your node also
-reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent
-config file):
+    HiddenServiceDir /var/lib/tor/hush-service/
+    HiddenServicePort 18030 127.0.0.1:18032

-	HiddenServiceDir /var/lib/tor/hush-service/
-	HiddenServicePort 18030 127.0.0.1:18030
+The directory can be different of course, but virtual port numbers should be equal to
+your hushd's P2P listen port (18030 by default), and target addresses and ports
+should be equal to binding address and port for inbound Tor connections (127.0.0.1:18032 by default).

-The directory can be different of course, but (both) port numbers should be equal to
-your hushd's P2P listen port (18030 by default).
+    -externalip=X   You can tell hush about its publicly reachable addresses using
+                    this option, and this can be an onion address. Given the above
+                    configuration, you can find your onion address in
+                    /var/lib/tor/hush-service/hostname. For connections
+                    coming from unroutable addresses (such as 127.0.0.1, where the
+                    Tor proxy typically runs), onion addresses are given
+                    preference for your node to advertise itself with.

-	-externalip=X   You can tell Hush about its publicly reachable address using
-	                this option, and this can be a .onion address. Given the above
-	                configuration, you can find your onion address in
-	                /var/lib/tor/hush-service/hostname. Onion addresses are given
-	                preference for your node to advertize itself with, for connections
-	                coming from unroutable addresses (such as 127.0.0.1, where the
-	                Tor proxy typically runs).
+                    You can set multiple local addresses with -externalip. The
+                    one that will be rumoured to a particular peer is the most
+                    compatible one and also using heuristics, e.g. the address
+                    with the most incoming connections, etc.

-	-listen         You'll need to enable listening for incoming connections, as this
-	                is off by default behind a proxy.
+    -listen         You'll need to enable listening for incoming connections, as this
+                    is off by default behind a proxy.

-	-discover       When -externalip is specified, no attempt is made to discover local
-	                IPv4 or IPv6 addresses. If you want to run a dual stack, reachable
-	                from both Tor and IPv4 (or IPv6), you'll need to either pass your
-	                other addresses using -externalip, or explicitly enable -discover.
-	                Note that both addresses of a dual-stack system may be easily
-	                linkable using traffic analysis.
+    -discover       When -externalip is specified, no attempt is made to discover local
+                    IPv4 or IPv6 addresses. If you want to run a dual stack, reachable
+                    from both Tor and IPv4 (or IPv6), you'll need to either pass your
+                    other addresses using -externalip, or explicitly enable -discover.
+                    Note that both addresses of a dual-stack system may be easily
+                    linkable using traffic analysis.

 In a typical situation, where you're only reachable via Tor, this should suffice:

-	./hushd -proxy=127.0.0.1:9050 -externalip=hushc0de123.onion -listen
+    ./hushd -proxy=127.0.0.1:9050 -externalip=7zvj7a2imdgkdbg4f2dryd5rgtrn7upivr5eeij4cicjh65pooxeshid.onion -listen

-(obviously, replace the Onion address with your own). Currently only v2 HS's are supported.
-It should be noted that you still listen on all devices and another node could establish a clearnet connection, when knowing
+(obviously, replace the .onion address with your own). It should be noted that you still
+listen on all devices and another node could establish a clearnet connection, when knowing
 your address. To mitigate this, additionally bind the address of your Tor proxy:

-	./hushd ... -bind=127.0.0.1
+    ./hushd ... -bind=127.0.0.1

 If you don't care too much about hiding your node, and want to be reachable on IPv4
 as well, use `discover` instead:

-	./hushd ... -discover
+    ./hushd ... -discover

-and open port 18030 on your firewall.
+and open port 18030 on your firewall (or use port mapping, i.e., `-upnp` or `-natpmp`).

-If you only want to use Tor to reach onion addresses, but not use it as a proxy
+If you only want to use Tor to reach .onion addresses, but not use it as a proxy
 for normal IPv4/IPv6 communication, use:

-	./hushd -onion=127.0.0.1:9050 -externalip=hushc0de123.onion -discover
+    ./hushd -onion=127.0.0.1:9050 -externalip=7zvj7a2imdgkdbg4f2dryd5rgtrn7upivr5eeij4cicjh65pooxeshid.onion -discover

+## 4. Privacy recommendations

-3. Automatically listen on Tor
--------------------------------
-
-Starting with Tor version 0.2.7.1 it is possible, through Tor's control socket
-API, to create and destroy 'ephemeral' hidden services programmatically.
-Hush has been updated to make use of this.
-
-This means that if Tor is running (and proper authentication has been configured),
-Hush automatically creates a hidden service to listen on. Hush will also use Tor
-automatically to connect to other .onion nodes if the control socket can be
-successfully opened. This will positively affect the number of available .onion
-nodes and their usage.
-
-This new feature is enabled by default if Hush is listening (`-listen`), and
-requires a Tor connection to work. It can be explicitly disabled with `-listenonion=0`
-and, if not disabled, configured using the `-torcontrol` and `-torpassword` settings.
-To show verbose debugging information, pass `-debug=tor`.
-
-Connecting to Tor's control socket API requires one of two authentication methods to be 
-configured. For cookie authentication the user running hushd must have write access 
-to the `CookieAuthFile` specified in Tor configuration. In some cases this is 
-preconfigured and the creation of a hidden service is automatic. If permission problems 
-are seen with `-debug=tor` they can be resolved by adding both the user running tor and 
-the user running hushd to the same group and setting permissions appropriately. On 
-Debian-based systems the user running hushd can be added to the debian-tor group, 
-which has the appropriate permissions. An alternative authentication method is the use 
-of the `-torpassword` flag and a `hash-password` which can be enabled and specified in 
-Tor configuration.
-
-
-4. Connect to a Hush hidden server
-----------------------------------
-
-To test your set-up, you might want to try connecting via Tor on a different computer to just a
-a single Hush hidden server. Launch hushd as follows:
-
-	./hushd -onion=127.0.0.1:9050 -connect=fuckzookoie6wxgio.onion
-
-Now use hush-cli to verify there is only a single peer connection.
-
-	hush-cli getpeerinfo
-
-	[
-	    {
-	        "id" : 1,
-	        "addr" : "zcashhoneypot.onion:18030",
-	        ...
-	        "version" : 1987420,
-	        "subver" : "/GoldenSandtrout:3.6.0/",
-	        ...
-	    }
-	]
-
-To connect to multiple Tor nodes, use:
-
-	./hushd -onion=127.0.0.1:9050 -addnode=hushbeef123.onion -dnsseed=0 -onlynet=onion
+- Do not add anything but Hush ports to the onion service created in section 3.
+  If you run a web service too, create a new onion service for that.
+  Otherwise it is trivial to link them, which may reduce privacy. Onion
+  services created automatically (as in section 2) always have only one port
+  open.
--- a/doc/zmq.md
+++ b/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.
--- a/doc/zsweep-consolidation.md
+++ b/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
+
--- a/migratecoin.sh
+++ b/migratecoin.sh
@@ -1,5 +1,5 @@
-#!/usr/bin/bash
-# Copyright (c) 2016-2021 The Hush developers
+#!/usr/usr/bin/env bash
+# Copyright (c) 2016-2023 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
--- a/qa/hush/checksec.sh
+++ b/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:
--- a/qa/hush/create_benchmark_archive.py
+++ b/qa/hush/create_benchmark_archive.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/hush/create_wallet_200k_utxos.py
+++ b/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-2023 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
--- a/qa/hush/full-test-suite.sh
+++ b/qa/hush/full-test-suite.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/hush/full_test_suite.py
+++ b/qa/hush/full_test_suite.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/pull-tester/cc-tests.sh
+++ b/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)
--- a/qa/pull-tester/rpc-tests.sh
+++ b/qa/pull-tester/rpc-tests.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
-# Copyright (c) 2016-2021 The Hush developers
+#!/usr/bin/env bash
+# Copyright (c) 2016-2023 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}

--- a/qa/pull-tester/run-bitcoin-cli
+++ b/qa/pull-tester/run-bitcoin-cli
@@ -1,5 +1,5 @@
-#!/bin/bash
-# Copyright (c) 2016-2021 The Hush developers
+#!/usr/bin/env bash
+# Copyright (c) 2016-2023 The Hush developers
 # Released under the GPLv3

 # This is a thin wrapper around bitcoin-cli that strips the Windows-style EOLs
--- a/qa/pull-tester/run-bitcoind-for-test.sh.in
+++ b/qa/pull-tester/run-bitcoind-for-test.sh.in
@@ -1,7 +1,7 @@
-#!/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-2023 The Hush developers
 # Released under the GPLv3
 #
 HUSH_LOAD_TIMEOUT=500
--- a/qa/pull-tester/tests-config.sh.in
+++ b/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-2023 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}"
--- a/qa/rpc-tests/ac_private.py
+++ b/qa/rpc-tests/ac_private.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/addressindex.py
+++ b/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-2023 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
--- a/qa/rpc-tests/bip65-cltv-p2p.py
+++ b/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-2023 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

--- a/qa/rpc-tests/bipdersig-p2p.py
+++ b/qa/rpc-tests/bipdersig-p2p.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
 #
--- a/qa/rpc-tests/blockchain.py
+++ b/qa/rpc-tests/blockchain.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/cryptoconditions.py
+++ b/qa/rpc-tests/cryptoconditions.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/cryptoconditions_channels.py
+++ b/qa/rpc-tests/cryptoconditions_channels.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/cryptoconditions_dice.py
+++ b/qa/rpc-tests/cryptoconditions_dice.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/cryptoconditions_faucet.py
+++ b/qa/rpc-tests/cryptoconditions_faucet.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/cryptoconditions_gateways.py
+++ b/qa/rpc-tests/cryptoconditions_gateways.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/cryptoconditions_heir.py
+++ b/qa/rpc-tests/cryptoconditions_heir.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/cryptoconditions_oracles.py
+++ b/qa/rpc-tests/cryptoconditions_oracles.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/cryptoconditions_rewards.py
+++ b/qa/rpc-tests/cryptoconditions_rewards.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/cryptoconditions_token.py
+++ b/qa/rpc-tests/cryptoconditions_token.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/qa/rpc-tests/decodescript.py
+++ b/qa/rpc-tests/decodescript.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2016-2021 The Hush developers
+# Copyright (c) 2016-2023 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
--- a/Show More
+++ b/Show More