diff --git a/configure.ac b/configure.ac
index c37f400c5b967..3b29b455ad0a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1423,9 +1423,9 @@ AC_SUBST(EVENT_PTHREADS_LIBS)
 AC_SUBST(ZMQ_LIBS)
 AC_SUBST(PROTOBUF_LIBS)
 AC_SUBST(QR_LIBS)
-AC_SUBST(DSYMUTIL_FLAT)
-AC_SUBST(USE_NUM_GMP)
-AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/config.ini])
+AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
+AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
+AC_CONFIG_FILES([qa/pull-tester/tests-config.sh],[chmod +x qa/pull-tester/tests-config.sh])
 AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
 AC_CONFIG_FILES([doc/Doxyfile])
 AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py])
diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index fbe36674b7e5d..5ee04744bf19e 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -8,8 +8,6 @@ check-doc.py
 Check if all command line args are documented. The return value indicates the
 number of undocumented args.
 
-clang-format-diff.py
-===================
 
 A script to format unified git diffs according to [.clang-format](../../src/.clang-format).
 
@@ -79,14 +77,13 @@ year rather than two hyphenated years.
 If the file already has a copyright for `The Ion Core developers`, the
 script will exit.
 
+=======
 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/
 
-git-subtree-check.sh
-====================
 
 Run this script from the root of the repository to verify that a subtree matches the contents of
 the commit it claims to have been updated to.
@@ -101,6 +98,14 @@ maintained:
 Usage: `git-subtree-check.sh DIR (COMMIT)`
 
 `COMMIT` may be omitted, in which case `HEAD` is used.
+=======
+With in-tree builds this tool can be run from any directory within the
+repostitory. To use this tool with out-of-tree builds set `BUILDDIR`. For
+example:
+
+```bash
+BUILDDIR=$PWD/build contrib/devtools/gen-manpages.sh
+```
 
 github-merge.py
 ===============
diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh
index fad9addc6c2de..74f7bed741f0e 100755
--- a/contrib/devtools/gen-manpages.sh
+++ b/contrib/devtools/gen-manpages.sh
@@ -1,18 +1,20 @@
 #!/bin/bash
 
 TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)}
-SRCDIR=${SRCDIR:-$TOPDIR/src}
+BUILDDIR=${BUILDDIR:-$TOPDIR}
+
+BINDIR=${BINDIR:-$BUILDDIR/src}
 MANDIR=${MANDIR:-$TOPDIR/doc/man}
 
-BITCOIND=${BITCOIND:-$SRCDIR/iond}
-BITCOINCLI=${BITCOINCLI:-$SRCDIR/ion-cli}
-BITCOINTX=${BITCOINTX:-$SRCDIR/ion-tx}
-BITCOINQT=${BITCOINQT:-$SRCDIR/qt/ion-qt}
+IOND=${IOND:-$BINDIR/iond}
+IONCLI=${IONCLI:-$BINDIR/ion-cli}
+IONTX=${IONTX:-$BINDIR/ion-tx}
+IONQT=${IONQT:-$BINDIR/qt/ion-qt}
 
 [ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1
 
 # The autodetected version git tag can screw up manpage output a little bit
-BTCVER=($($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))
+IONVER=($($IONCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))
 
 # Create a footer file with copyright content.
 # This gets autodetected fine for dashd if --version-string is not set,
@@ -22,8 +24,8 @@ $BITCOIND --version | sed -n '1!p' >> footer.h2m
 
 for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $BITCOINQT; do
   cmdname="${cmd##*/}"
-  help2man -N --version-string=${BTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
-  sed -i "s/\\\-${BTCVER[1]}//g" ${MANDIR}/${cmdname}.1
+  help2man -N --version-string=${IONVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
+  sed -i "s/\\\-${IONVER[1]}//g" ${MANDIR}/${cmdname}.1
 done
 
 rm -f footer.h2m
diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml
index d0b571fed502a..160a8da41e383 100644
--- a/contrib/gitian-descriptors/gitian-win-signer.yml
+++ b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -15,11 +15,7 @@ remotes:
 - "url": "https://github.com/cevap/ion-detached-sigs.git"
   "dir": "signature"
 files:
-<<<<<<< HEAD
-- "osslsigncode-1.7.1.tar.xz"
-=======
 - "v1.7.1.tar.gz"
->>>>>>> Change urls for osslsigncode v1.7.1 to use from sources from our repo, ref: #13
 - "osslsigncode-Backports-to-1.7.1.patch"
 - "ion-win-unsigned.tar.gz"
 script: |
@@ -29,21 +25,13 @@ script: |
   SIGDIR=${BUILD_DIR}/signature/win
   UNSIGNED_DIR=${BUILD_DIR}/unsigned
 
-<<<<<<< HEAD
-  echo "75cb7377106c423dd63843798b43fd4a7d697b3fb51a0202b1a808018283e5f3  osslsigncode-1.7.1.tar.xz" | sha256sum -c
-=======
   echo "f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9  v1.7.1.tar.gz" | sha256sum -c
->>>>>>> Change urls for osslsigncode v1.7.1 to use from sources from our repo, ref: #13
   echo "a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911  osslsigncode-Backports-to-1.7.1.patch" | sha256sum -c
 
   mkdir -p ${UNSIGNED_DIR}
   tar -C ${UNSIGNED_DIR} -xf ioncore-win-unsigned.tar.xz
 
-<<<<<<< HEAD
-  tar xJf osslsigncode-1.7.1.tar.xz
-=======
   tar xf v1.7.1.tar.gz
->>>>>>> Change urls for osslsigncode v1.7.1 to use from sources from our repo, ref: #13
   cd osslsigncode-1.7.1
   patch -p1 < ${BUILD_DIR}/osslsigncode-Backports-to-1.7.1.patch
 
diff --git a/doc/man/ion-cli.1 b/doc/man/ion-cli.1
index 7592f7833f68d..2fb8b5ae09aae 100644
--- a/doc/man/ion-cli.1
+++ b/doc/man/ion-cli.1
@@ -1,17 +1,19 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH ION-CLI "1" "June 2019" "ion-cli v5.0.99.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH ION-CLI "1" "April 2018" "ion-cli v3.0.4.0" "User Commands"
 .SH NAME
-ion-cli \- manual page for ion-cli v5.0.99.0
+ion-cli \- manual page for ion-cli v3.0.4.0
 .SH DESCRIPTION
-Ion Core RPC client version v5.0.99.0
+Ion Core RPC client version v3.0.4.0\-CEVAP
 .SS "Usage:"
 .TP
 ion\-cli [options] <command> [params]
 Send command to Ion Core
-.IP
-ion\-cli [options] \fB\-named\fR <command> [name=value] ... Send command to Ion Core (with named arguments)
-ion\-cli [options] help                List commands
-ion\-cli [options] help <command>      Get help for a command
+.TP
+ion\-cli [options] help
+List commands
+.TP
+ion\-cli [options] help <command>
+Get help for a command
 .SH OPTIONS
 .HP
 \-?
@@ -26,33 +28,15 @@ Specify configuration file (default: ioncoin.conf)
 .IP
 Specify data directory
 .HP
-\fB\-getinfo\fR
-.IP
-Get general information from the remote server. Note that unlike
-server\-side RPC calls, the results of \fB\-getinfo\fR is the result of
-multiple non\-atomic requests. Some entries in the result may
-represent results from different states (e.g. wallet balance may
-be as of a different block from the chain state reported)
-.PP
-Chain selection options:
-.HP
 \fB\-testnet\fR
 .IP
-Use the test chain
-.HP
-\fB\-devnet=\fR<name>
-.IP
-Use devnet chain with provided name
+Use the test network
 .HP
 \fB\-regtest\fR
 .IP
 Enter regression test mode, which uses a special chain in which blocks
-can be solved instantly. This is intended for regression testing
-tools and app development.
-.HP
-\fB\-named\fR
-.IP
-Pass named instead of positional arguments (default: false)
+can be solved instantly. This is intended for regression testing tools
+and app development.
 .HP
 \fB\-rpcconnect=\fR<ip>
 .IP
@@ -60,7 +44,7 @@ Send commands to node running on <ip> (default: 127.0.0.1)
 .HP
 \fB\-rpcport=\fR<port>
 .IP
-Connect to JSON\-RPC on <port> (default: 12705 or testnet: 27171)
+Connect to JSON\-RPC on <port> (default: 51473 or testnet: 51475)
 .HP
 \fB\-rpcwait\fR
 .IP
@@ -76,40 +60,21 @@ Password for JSON\-RPC connections
 .HP
 \fB\-rpcclienttimeout=\fR<n>
 .IP
-Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
-900)
-.HP
-\fB\-stdinrpcpass\fR
-.TP
-Read RPC password from standard input as a single line.
-When combined
-.IP
-with \fB\-stdin\fR, the first line from standard input is used for the
-RPC password.
-.HP
-\fB\-stdin\fR
-.IP
-Read extra arguments from standard input, one per line until EOF/Ctrl\-D
-(recommended for sensitive information such as passphrases).
-When combined with \fB\-stdinrpcpass\fR, the first line from standard
-input is used for the RPC password.
-.HP
-\fB\-rpcwallet=\fR<walletname>
-.IP
-Send RPC for non\-default wallet on RPC server (needs to exactly match
-corresponding \fB\-wallet\fR option passed to dashd)
+Timeout during HTTP requests (default: 900)
 .SH COPYRIGHT
-Copyright (C) 2014-2020 The Dash Core developers
-Copyright (C) 2009-2020 The Bitcoin Core developers
+Copyright (C) 2009-2018 The Bitcoin Core Developers
+
+Copyright (C) 2014-2018 The Dash Core Developers
 
-Please contribute if you find Ion Core useful. Visit <https://ionomy.com> for
-further information about the software.
-The source code is available from <https://bitbucket.org/ioncoin/ion>.
+Copyright (C) 2015-2018 The PIVX Core Developers
+
+Copyright (C) 2018 The Ion Core Developers
 
 This is experimental software.
+
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
+or <http://www.opensource.org/licenses/mit-license.php>.
 
 This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
-Eric Young and UPnP software written by Thomas Bernard.
+OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
+by Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/ion-qt.1 b/doc/man/ion-qt.1
index 05cdb6ca44ef0..c673fa7947e73 100644
--- a/doc/man/ion-qt.1
+++ b/doc/man/ion-qt.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH ION-QT "1" "June 2019" "ion-qt v5.0.99.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH ION-QT "1" "April 2018" "ion-qt v3.0.4.0" "User Commands"
 .SH NAME
-ion-qt \- manual page for ion-qt v5.0.99.0
+ion-qt \- manual page for ion-qt v3.0.4.0
 .SH DESCRIPTION
-Ion Core version v5.0.99.0 (64\-bit)
+Ion Core version v3.0.4.0\-CEVAP (64\-bit)
 Usage:
 .IP
 ion\-qt [command\-line options]
@@ -11,7 +11,7 @@ ion\-qt [command\-line options]
 .HP
 \-?
 .IP
-Print this help message and exit
+This help message
 .HP
 \fB\-version\fR
 .IP
@@ -22,19 +22,23 @@ Print version and exit
 Execute command when a relevant alert is received or we see a really
 long fork (%s in cmd is replaced by message)
 .HP
+\fB\-alerts\fR
+.IP
+Receive and display P2P network alerts (default: 1)
+.HP
 \fB\-blocknotify=\fR<cmd>
 .IP
 Execute command when the best block changes (%s in cmd is replaced by
 block hash)
 .HP
-\fB\-assumevalid=\fR<hex>
+\fB\-blocksizenotify=\fR<cmd>
 .IP
-If this block is in the chain assume that it and its ancestors are valid
-and potentially skip their script verification (0 to verify all,
-default:
-00000000000000022f355c52417fca9b73306958f7c0832b3a7bce006ca369ef,
-testnet:
-000008b78b6aef3fd05ab78db8b76c02163e885305545144420cb08704dce538)
+Execute command when the best block changes and its size is over (%s in
+cmd is replaced by block hash, %d with the block size)
+.HP
+\fB\-checkblocks=\fR<n>
+.IP
+How many blocks to check at startup (default: 500, 0 = all)
 .HP
 \fB\-conf=\fR<file>
 .IP
@@ -46,71 +50,44 @@ Specify data directory
 .HP
 \fB\-dbcache=\fR<n>
 .IP
-Set database cache size in megabytes (4 to 16384, default: 300)
-.HP
-\fB\-debuglogfile=\fR<file>
-.IP
-Specify location of debug log file. Relative paths will be prefixed by a
-net\-specific datadir location. (default: debug.log)
+Set database cache size in megabytes (4 to 4096, default: 100)
 .HP
 \fB\-loadblock=\fR<file>
 .IP
 Imports blocks from external blk000??.dat file on startup
 .HP
-\fB\-maxorphantxsize=\fR<n>
-.IP
-Maximum total size of all orphan transactions in megabytes (default: 10)
-.HP
-\fB\-maxmempool=\fR<n>
-.IP
-Keep the transaction memory pool below <n> megabytes (default: 300)
-.HP
-\fB\-mempoolexpiry=\fR<n>
+\fB\-maxreorg=\fR<n>
 .IP
-Do not keep transactions in the mempool longer than <n> hours (default:
-336)
+Set the Maximum reorg depth (default: 100)
 .HP
-\fB\-persistmempool\fR
+\fB\-maxorphantx=\fR<n>
 .IP
-Whether to save the mempool on shutdown and load on restart (default: 1)
-.HP
-\fB\-syncmempool\fR
-.IP
-Sync mempool from other nodes on start (default: 1)
-.HP
-\fB\-blockreconstructionextratxn=\fR<n>
-.IP
-Extra transactions to keep in memory for compact block reconstructions
-(default: 100)
+Keep at most <n> unconnectable transactions in memory (default: 100)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
 .IP
 Specify pid file (default: iond.pid)
 .HP
-\fB\-prune=\fR<n>
+\fB\-reindex\fR
+.IP
+Rebuild block chain index from current blk000??.dat files on startup
+.HP
+\fB\-reindexaccumulators\fR
 .IP
-Reduce storage requirements by enabling pruning (deleting) of old
-blocks. This allows the pruneblockchain RPC to be called to
-delete specific blocks, and enables automatic pruning of old
-blocks if a target size in MiB is provided. This mode is
-incompatible with \fB\-txindex\fR, \fB\-rescan\fR and \fB\-disablegovernance\fR=\fI\,false\/\fR.
-Warning: Reverting this setting requires re\-downloading the
-entire blockchain. (default: 0 = disable pruning blocks, 1 =
-allow manual pruning via RPC, >945 = automatically prune block
-files to stay under the specified target size in MiB)
+Reindex the accumulator database on startup
 .HP
-\fB\-reindex\-chainstate\fR
+\fB\-reindexmoneysupply\fR
 .IP
-Rebuild chain state from the currently indexed blocks
+Reindex the ION and xION money supply statistics on startup
 .HP
-\fB\-reindex\fR
+\fB\-resync\fR
 .IP
-Rebuild chain state and block index from the blk*.dat files on disk
+Delete blockchain folders and resync from scratch on startup
 .HP
 \fB\-sysperms\fR
 .IP
@@ -120,33 +97,17 @@ Create new files with system default permissions, instead of umask 077
 \fB\-txindex\fR
 .IP
 Maintain a full transaction index, used by the getrawtransaction rpc
-call (default: 1)
-.HP
-\fB\-addressindex\fR
-.IP
-Maintain a full address index, used to query for the balance, txids and
-unspent outputs for addresses (default: 0)
+call (default: 0)
 .HP
-\fB\-timestampindex\fR
+\fB\-forcestart\fR
 .IP
-Maintain a timestamp index for block hashes, used to query blocks hashes
-by a range of timestamps (default: 0)
-.HP
-\fB\-spentindex\fR
-.IP
-Maintain a full spent index, used to query the spending txid and input
-index for an outpoint (default: 0)
+Attempt to force blockchain corruption recovery on startup
 .PP
 Connection options:
 .HP
 \fB\-addnode=\fR<ip>
 .IP
-Add a node to connect to and attempt to keep the connection open (see
-the `addnode` RPC command help for more info)
-.HP
-\fB\-allowprivatenet\fR
-.IP
-Allow RFC1918 addresses to be relayed and connected to (default: 0)
+Add a node to connect to and attempt to keep the connection open
 .HP
 \fB\-banscore=\fR<n>
 .IP
@@ -164,14 +125,11 @@ for IPv6
 .HP
 \fB\-connect=\fR<ip>
 .IP
-Connect only to the specified node(s); \fB\-connect\fR=\fI\,0\/\fR disables automatic
-connections (the rules for this peer are the same as for
-\fB\-addnode\fR)
+Connect only to the specified node(s)
 .HP
 \fB\-discover\fR
 .IP
-Discover own IP addresses (default: 1 when listening and no \fB\-externalip\fR
-or \fB\-proxy\fR)
+Discover own IP address (default: 1 when listening and no \fB\-externalip\fR)
 .HP
 \fB\-dns\fR
 .IP
@@ -180,11 +138,7 @@ Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (def
 \fB\-dnsseed\fR
 .IP
 Query for peer addresses via DNS lookup, if low on addresses (default: 1
-unless \fB\-connect\fR used)
-.HP
-\fB\-enablebip61\fR
-.IP
-Send reject messages per BIP61 (default: 1)
+unless \fB\-connect\fR)
 .HP
 \fB\-externalip=\fR<ip>
 .IP
@@ -204,8 +158,7 @@ Automatically create Tor hidden service (default: 1)
 .HP
 \fB\-maxconnections=\fR<n>
 .IP
-Maintain at most <n> connections to peers (temporary service connections
-excluded) (default: 125)
+Maintain at most <n> connections to peers (default: 125)
 .HP
 \fB\-maxreceivebuffer=\fR<n>
 .IP
@@ -215,12 +168,6 @@ Maximum per\-connection receive buffer, <n>*1000 bytes (default: 5000)
 .IP
 Maximum per\-connection send buffer, <n>*1000 bytes (default: 1000)
 .HP
-\fB\-maxtimeadjustment\fR
-.IP
-Maximum allowed median peer time offset adjustment. Local perspective of
-time may be influenced by peers forward or backward by this
-amount. (default: 4200 seconds)
-.HP
 \fB\-onion=\fR<ip:port>
 .IP
 Use separate SOCKS5 proxy to reach peers via Tor hidden services
@@ -241,7 +188,7 @@ Support filtering of blocks and transaction with bloom filters (default:
 .HP
 \fB\-port=\fR<port>
 .IP
-Listen for connections on <port> (default: 9999 or testnet: 19999)
+Listen for connections on <port> (default: 12700 or testnet: 27170)
 .HP
 \fB\-proxy=\fR<ip:port>
 .IP
@@ -256,10 +203,6 @@ stream isolation (default: 1)
 .IP
 Connect to a node to retrieve peer addresses, and disconnect
 .HP
-\fB\-socketevents=\fR<mode>
-.IP
-Socket events mode, which must be one of: 'select' (default: select)
-.HP
 \fB\-timeout=\fR<n>
 .IP
 Specify connection timeout in milliseconds (minimum: 1, default: 5000)
@@ -282,46 +225,26 @@ Use UPnP to map the listening port (default: 0)
 Bind to given address and whitelist peers connecting to it. Use
 [host]:port notation for IPv6
 .HP
-\fB\-whitelist=\fR<IP address or network>
+\fB\-whitelist=\fR<netmask>
 .IP
-Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or
-CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple
-times. Whitelisted peers cannot be DoS banned and their
-transactions are always relayed, even if they are already in the
+Whitelist peers connecting from the given netmask or IP address. Can be
+specified multiple times. Whitelisted peers cannot be DoS banned and
+their transactions are always relayed, even if they are already in the
 mempool, useful e.g. for a gateway
-.HP
-\fB\-maxuploadtarget=\fR<n>
-.IP
-Tries to keep outbound traffic under the given target (in MiB per 24h),
-0 = no limit (default: 0)
 .PP
 Wallet options:
 .HP
+\fB\-createwalletbackups=\fR<n>
+.IP
+Number of automatic wallet backups (default: 10)
+.HP
 \fB\-disablewallet\fR
 .IP
 Do not load the wallet and disable wallet RPC calls
 .HP
 \fB\-keypool=\fR<n>
 .IP
-Set key pool size to <n> (default: 1000)
-.HP
-\fB\-fallbackfee=\fR<amt>
-.IP
-A fee rate (in ION/kB) that will be used when fee estimation has
-insufficient data (default: 0.00001)
-.HP
-\fB\-discardfee=\fR<amt>
-.IP
-The fee rate (in DASH/kB) that indicates your tolerance for discarding
-change by adding it to the fee (default: 0.0001). Note: An output
-is discarded if it is dust at this rate, but we will always
-discard up to the dust relay fee and a discard fee above that is
-limited by the fee estimate for the longest target
-.HP
-\fB\-mintxfee=\fR<amt>
-.IP
-Fees (in ION/kB) smaller than this are considered zero fee for
-transaction creation (default: 0.00001)
+Set key pool size to <n> (default: 100)
 .HP
 \fB\-paytxfee=\fR<amt>
 .IP
@@ -333,142 +256,52 @@ Rescan the block chain for missing wallet transactions on startup
 .HP
 \fB\-salvagewallet\fR
 .IP
-Attempt to recover private keys from a corrupt wallet on startup
-.HP
-\fB\-spendzeroconfchange\fR
-.IP
-Spend unconfirmed change when sending transactions (default: 1)
+Attempt to recover private keys from a corrupt wallet.dat on startup
 .HP
-\fB\-txconfirmtarget=\fR<n>
+\fB\-sendfreetransactions\fR
 .IP
-If paytxfee is not set, include enough fee so transactions begin
-confirmation on average within n blocks (default: 6)
+Send transactions as zero\-fee transactions if possible (default: 0)
 .HP
-\fB\-usehd\fR
+\fB\-spendzeroconfchange\fR
 .IP
-Use hierarchical deterministic key generation (HD) after BIP39/BIP44.
-Only has effect during wallet creation/first start (default: 0)
+Spend unconfirmed change when sending transactions (default: 1)
 .HP
-\fB\-mnemonic=\fR<text>
+\fB\-disablesystemnotifications\fR
 .IP
-User defined mnemonic for HD wallet (bip39). Only has effect during
-wallet creation/first start (default: randomly generated)
+Disable OS notifications for incoming transactions (default: 0)
 .HP
-\fB\-mnemonicpassphrase=\fR<text>
+\fB\-txconfirmtarget=\fR<n>
 .IP
-User defined mnemonic passphrase for HD wallet (BIP39). Only has effect
-during wallet creation/first start (default: empty string)
+If paytxfee is not set, include enough fee so transactions begin
+confirmation on average within n blocks (default: 1)
 .HP
-\fB\-hdseed=\fR<hex>
+\fB\-maxtxfee=\fR<amt>
 .IP
-User defined seed for HD wallet (should be in hex). Only has effect
-during wallet creation/first start (default: randomly generated)
+Maximum total fees to use in a single wallet transaction, setting too
+low may abort large transactions (default: 1.00)
 .HP
 \fB\-upgradewallet\fR
 .IP
 Upgrade wallet to latest format on startup
 .HP
-\fB\-wallet=\fR<path>
+\fB\-wallet=\fR<file>
 .IP
-Specify wallet database path. Can be specified multiple times to load
-multiple wallets. Path is interpreted relative to <walletdir> if
-it is not absolute, and will be created if it does not exist (as
-a directory containing a wallet.dat file and log files). For
-backwards compatibility this will also accept names of existing
-data files in <walletdir>.)
-.HP
-\fB\-walletbroadcast\fR
-.IP
-Make the wallet broadcast transactions (default: 1)
-.HP
-\fB\-walletdir=\fR<dir>
-.IP
-Specify directory to hold wallets (default: <datadir>/wallets if it
-exists, otherwise <datadir>)
+Specify wallet file (within data directory) (default: wallet.dat)
 .HP
 \fB\-walletnotify=\fR<cmd>
 .IP
 Execute command when a wallet transaction changes (%s in cmd is replaced
 by TxID)
 .HP
+\fB\-windowtitle=\fR<name>
+.IP
+Wallet window title
+.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)
-.HP
-\fB\-createwalletbackups=\fR<n>
-.IP
-Number of automatic wallet backups (default: 10)
-.HP
-\fB\-walletbackupsdir=\fR<dir>
-.IP
-Specify full path to directory for automatic wallet backups (must exist)
-.HP
-\fB\-keepass\fR
-.IP
-Use KeePass 2 integration using KeePassHttp plugin (default: 0)
-.HP
-\fB\-keepassport=\fR<port>
-.IP
-Connect to KeePassHttp on port <port> (default: 19455)
-.HP
-\fB\-keepasskey=\fR<key>
-.IP
-KeePassHttp key for AES encrypted communication with KeePass
-.HP
-\fB\-keepassid=\fR<id>
-.IP
-KeePassHttp id for the established association
-.HP
-\fB\-keepassname=\fR<name>
-.IP
-Name to construct url for KeePass entry that stores the wallet
-passphrase
-.PP
-PrivateSend options:
-.HP
-\fB\-enableprivatesend\fR
-.IP
-Enable use of PrivateSend for funds stored in this wallet (0\-1, default:
-0)
-.HP
-\fB\-privatesendautostart\fR
-.IP
-Start PrivateSend automatically (0\-1, default: 0)
-.HP
-\fB\-privatesendmultisession\fR
-.IP
-Enable multiple PrivateSend mixing sessions per block, experimental
-(0\-1, default: 0)
-.HP
-\fB\-privatesendsessions=\fR<n>
-.IP
-Use N separate masternodes in parallel to mix funds (1\-10, default: 4)
-.HP
-\fB\-privatesendrounds=\fR<n>
-.IP
-Use N separate masternodes for each denominated input to mix funds
-(2\-16, default: 4)
-.HP
-\fB\-privatesendamount=\fR<n>
-.IP
-Target PrivateSend balance (2\-21000000, default: 1000)
-.HP
-\fB\-privatesenddenomsgoal=\fR<n>
-.IP
-Try to create at least N inputs of each denominated amount (10\-100000,
-default: 50)
-.HP
-\fB\-privatesenddenomshardcap=\fR<n>
-.IP
-Create up to N inputs of each denominated amount (10\-100000, default:
-300)
-.HP
-\fB\-windowtitle=\fR<name>
-.IP
-Sets a window title which is appended to "Dash Core \- "
+account owner and payment request information, 2 = drop tx meta data)
 .PP
 ZeroMQ notification options:
 .HP
@@ -482,20 +315,7 @@ Enable publish hash transaction in <address>
 .HP
 \fB\-zmqpubhashtxlock=\fR<address>
 .IP
-Enable publish hash transaction (locked via InstantSend) in <address>
-.HP
-\fB\-zmqpubhashgovernancevote=\fR<address>
-.IP
-Enable publish hash of governance votes in <address>
-.HP
-\fB\-zmqpubhashgovernanceobject=\fR<address>
-.IP
-Enable publish hash of governance objects (like proposals) in <address>
-.HP
-\fB\-zmqpubhashinstantsenddoublespend=\fR<address>
-.IP
-Enable publish transaction hashes of attempted InstantSend double spend
-in <address>
+Enable publish hash transaction (locked via SwiftX) in <address>
 .HP
 \fB\-zmqpubrawblock=\fR<address>
 .IP
@@ -507,35 +327,26 @@ Enable publish raw transaction in <address>
 .HP
 \fB\-zmqpubrawtxlock=\fR<address>
 .IP
-Enable publish raw transaction (locked via InstantSend) in <address>
-.HP
-\fB\-zmqpubrawinstantsenddoublespend=\fR<address>
-.IP
-Enable publish raw transactions of attempted InstantSend double spend in
-<address>
+Enable publish raw transaction (locked via SwiftX) in <address>
 .PP
 Debugging/Testing options:
 .HP
-\fB\-uacomment=\fR<cmt>
-.IP
-Append comment to the user agent string
-.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: net, tor,
-mempool, http, bench, zmq, db, rpc, estimatefee, addrman,
-selectcoins, reindex, cmpctblock, rand, prune, proxy, mempoolrej,
-libevent, coindb, qt, leveldb, chainlocks, gobject, instantsend,
-keepass, llmq, llmq\-dkg, llmq\-sigs, mnpayments, mnsync,
-privatesend, spork, netconn.
+optional). If <category> is not supplied, output all debugging
+information.<category> can be: addrman, alert, bench, coindb, db, lock,
+rand, rpc, selectcoins, tor, mempool, net, proxy, ion, (obfuscation,
+swiftx, masternode, mnpayments, mnbudget, zero), qt.
 .HP
-\fB\-debugexclude=\fR<category>
+\fB\-gen\fR
 .IP
-Exclude debugging information for a category. Can be used in conjunction
-with \fB\-debug\fR=\fI\,1\/\fR to output debug logs for all categories except one
-or more specified categories.
+Generate coins (default: 0)
+.HP
+\fB\-genproclimit=\fR<n>
+.IP
+Set the number of threads for coin generation if enabled (\fB\-1\fR = all
+cores, default: 1)
 .HP
 \fB\-help\-debug\fR
 .IP
@@ -549,104 +360,101 @@ Include IP addresses in debug output (default: 0)
 .IP
 Prepend debug output with timestamp (default: 1)
 .HP
-\fB\-maxtxfee=\fR<amt>
+\fB\-minrelaytxfee=\fR<amt>
 .IP
-Maximum total fees (in ION) to use in a single wallet transaction or
-raw transaction; setting this too low may abort large
-transactions (default: 0.10)
+Fees (in ION/Kb) smaller than this are considered zero fee for relaying
+(default: 0.0001)
 .HP
 \fB\-printtoconsole\fR
 .IP
-Send trace/debug info to console instead of debug.log file
-.HP
-\fB\-printtodebuglog\fR
-.IP
-Send trace/debug info to debug.log file (default: 1)
+Send trace/debug info to console instead of debug.log file (default: 0)
 .HP
 \fB\-shrinkdebugfile\fR
 .IP
 Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR)
-.PP
-Chain selection options:
 .HP
 \fB\-testnet\fR
 .IP
-Use the test chain
-.HP
-\fB\-devnet=\fR<name>
-.IP
-Use devnet chain with provided name
+Use the test network
 .HP
-\fB\-disablegovernance\fR
+\fB\-litemode=\fR<n>
 .IP
-Disable all Ion specific functionality (Masternodes, PrivateSend,
-InstantSend, Governance) (0\-1, default: 0)
+Disable all ION specific functionality (Masternodes, Zerocoin, SwiftX,
+Budgeting) (0\-1, default: 0)
+.PP
+Staking options:
 .HP
-\fB\-sporkaddr=\fR<ionaddress>
+\fB\-staking=\fR<n>
 .IP
-Override spork address. Only useful for regtest and devnet. Using this
-on mainnet or testnet will ban you.
+Enable staking functionality (0\-1, default: 1)
 .HP
-\fB\-minsporkkeys=\fR<n>
+\fB\-reservebalance=\fR<amt>
 .IP
-Overrides minimum spork signers to change spork value. Only useful for
-regtest and devnet. Using this on mainnet or testnet will ban
-you.
+Keep the specified amount available for spending at all times (default:
+0)
 .PP
 Masternode options:
 .HP
-\fB\-masternodeblsprivkey=\fR<hex>
+\fB\-masternode=\fR<n>
 .IP
-Set the masternode BLS private key
-.PP
-PrivateSend options:
+Enable the client to act as a masternode (0\-1, default: 0)
 .HP
-\fB\-enableprivatesend\fR
+\fB\-mnconf=\fR<file>
 .IP
-Enable use of automated PrivateSend for funds stored in this wallet
-(0\-1, default: 0)
+Specify masternode configuration file (default: masternode.conf)
 .HP
-\fB\-privatesendmultisession\fR
+\fB\-mnconflock=\fR<n>
 .IP
-Enable multiple PrivateSend mixing sessions per block, experimental
-(0\-1, default: 0)
+Lock masternodes from masternode configuration file (default: 1)
 .HP
-\fB\-privatesendsessions=\fR<n>
+\fB\-masternodeprivkey=\fR<n>
 .IP
-Use N separate masternodes in parallel to mix funds (1\-10, default: 4)
+Set the masternode private key
 .HP
-\fB\-privatesendrounds=\fR<n>
+\fB\-masternodeaddr=\fR<n>
 .IP
-Use N separate masternodes for each denominated input to mix funds
-(2\-16, default: 4)
+Set external address:port to get to this masternode (example:
+128.127.106.235:12700)
 .HP
-\fB\-privatesendamount=\fR<n>
+\fB\-budgetvotemode=\fR<mode>
 .IP
-Keep N ION anonymized (2\-21000000, default: 1000)
+Change automatic finalized budget voting behavior. mode=auto: Vote for
+only exact finalized budget match to my generated budget. (string,
+default: auto)
+.PP
+Zerocoin options:
 .HP
-\fB\-privatesenddenoms=\fR<n>
+\fB\-enablezeromint=\fR<n>
 .IP
-Create up to N inputs of each denominated amount (10\-100000, default:
-300)
+Enable automatic Zerocoin minting (0\-1, default: 1)
 .HP
-\fB\-liquidityprovider=\fR<n>
+\fB\-zeromintpercentage=\fR<n>
 .IP
-Provide liquidity to PrivateSend by infrequently mixing coins on a
-continual basis (0\-100, default: 0, 1=very frequent, high fees,
-100=very infrequent, low fees)
-.PP
-InstantSend options:
+Percentage of automatically minted Zerocoin (1\-100, default: 10)
 .HP
-\fB\-instantsendnotify=\fR<cmd>
+\fB\-preferredDenom=\fR<n>
 .IP
-Execute command when a wallet InstantSend transaction is successfully
-locked (%s in cmd is replaced by TxID)
+Preferred Denomination for automatically minted Zerocoin
+(1/5/10/50/100/500/1000/5000), 0 for no preference. default: 0)
+.HP
+\fB\-backupxION=\fR<n>
+.IP
+Enable automatic wallet backups triggered after each xION minting (0\-1,
+default: 1)
 .PP
-Node relay options:
+SwiftX options:
 .HP
-\fB\-bytespersigop\fR
+\fB\-enableswifttx=\fR<n>
 .IP
-Minimum bytes per sigop in transactions we relay and mine (default: 20)
+Enable SwiftX, show confirmations for locked transactions (bool,
+default: true)
+.HP
+\fB\-swifttxdepth=\fR<n>
+.IP
+Show N confirmations for a successfully locked transaction (0\-9999,
+default: 5)
+.PP
+Node relay options:
 .HP
 \fB\-datacarrier\fR
 .IP
@@ -656,32 +464,21 @@ Relay and mine data carrier transactions (default: 1)
 .IP
 Maximum size of data in data carrier transactions we relay and mine
 (default: 83)
-.HP
-\fB\-minrelaytxfee=\fR<amt>
-.IP
-Fees (in ION/kB) smaller than this are considered zero fee for
-relaying, mining and transaction creation (default: 0.00001)
-.HP
-\fB\-whitelistrelay\fR
-.IP
-Accept relayed transactions received from whitelisted peers even when
-not relaying transactions (default: 1)
-.HP
-\fB\-whitelistforcerelay\fR
-.IP
-Force relay of transactions from whitelisted peers even if they violate
-local relay policy (default: 1)
 .PP
 Block creation options:
 .HP
+\fB\-blockminsize=\fR<n>
+.IP
+Set minimum block size in bytes (default: 0)
+.HP
 \fB\-blockmaxsize=\fR<n>
 .IP
-Set maximum block size in bytes (default: 2000000)
+Set maximum block size in bytes (default: 750000)
 .HP
-\fB\-blockmintxfee=\fR<amt>
+\fB\-blockprioritysize=\fR<n>
 .IP
-Set lowest fee rate (in ION/kB) for transactions to be included in
-block creation. (default: 0.00001)
+Set maximum size of high\-priority/low\-fee transactions in bytes
+(default: 50000)
 .PP
 RPC server options:
 .HP
@@ -693,19 +490,15 @@ Accept command line and JSON\-RPC commands
 .IP
 Accept public REST requests (default: 0)
 .HP
-\fB\-rpcbind=\fR<addr>[:port]
+\fB\-rpcbind=\fR<addr>
 .IP
-Bind to given address to listen for JSON\-RPC connections. This option is
-ignored unless \fB\-rpcallowip\fR is also passed. Port is optional and
-overrides \fB\-rpcport\fR. Use [host]:port notation for IPv6. This
-option can be specified multiple times (default: 127.0.0.1 and
-::1 i.e., localhost, or if \fB\-rpcallowip\fR has been specified,
-0.0.0.0 and :: i.e., all addresses)
+Bind to given address to listen for JSON\-RPC connections. Use
+[host]:port notation for IPv6. This option can be specified multiple
+times (default: bind to all interfaces)
 .HP
 \fB\-rpccookiefile=\fR<loc>
 .IP
-Location of the auth cookie. Relative paths will be prefixed by a
-net\-specific datadir location. (default: data dir)
+Location of the auth cookie (default: data dir)
 .HP
 \fB\-rpcuser=\fR<user>
 .IP
@@ -715,15 +508,6 @@ Username for JSON\-RPC connections
 .IP
 Password for JSON\-RPC connections
 .HP
-\fB\-rpcauth=\fR<userpw>
-.IP
-Username and hashed password for JSON\-RPC connections. The field
-<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A
-canonical python script is included in share/rpcuser. The client
-then connects normally using the
-rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This
-option can be specified multiple times
-.HP
 \fB\-rpcport=\fR<port>
 .IP
 Listen for JSON\-RPC connections on <port> (default: 12705 or testnet:
@@ -732,9 +516,9 @@ Listen for JSON\-RPC connections on <port> (default: 12705 or testnet:
 \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
@@ -746,29 +530,6 @@ UI Options:
 .IP
 Choose data directory on startup (default: 0)
 .HP
-\fB\-custom\-css\-dir\fR
-.IP
-Set a directory which contains custom css files. Those will be used as
-stylesheets for the UI.
-.HP
-\fB\-font\-family\fR
-.IP
-Set the font family. Possible values: SystemDefault, Montserrat.
-(default: SystemDefault)
-.HP
-\fB\-font\-scale\fR
-.IP
-Set a scale factor which gets applied to the base font size. Possible
-range \fB\-100\fR (smallest fonts) to 100 (largest fonts). (default: 0)
-.HP
-\fB\-font\-weight\-bold\fR
-.IP
-Set the font weight for bold texts. Possible range 0 to 8 (default: 4)
-.HP
-\fB\-font\-weight\-normal\fR
-.IP
-Set the font weight for normal texts. Possible range 0 to 8 (default: 1)
-.HP
 \fB\-lang=\fR<lang>
 .IP
 Set language, for example "de_DE" (default: system locale)
@@ -784,22 +545,20 @@ Set SSL root certificates for payment request (default: \fB\-system\-\fR)
 \fB\-splash\fR
 .IP
 Show splash screen on startup (default: 1)
-.HP
-\fB\-resetguisettings\fR
-.IP
-Reset all settings changed in the GUI
 .SH COPYRIGHT
-Copyright (C) 2014-2020 The Dash Core developers
-Copyright (C) 2009-2020 The Bitcoin Core developers
+Copyright (C) 2009-2018 The Bitcoin Core Developers
+
+Copyright (C) 2014-2018 The Dash Core Developers
 
-Please contribute if you find Ion Core useful. Visit <https://ionomy.com> for
-further information about the software.
-The source code is available from <https://bitbucket.org/ioncoin/ion>.
+Copyright (C) 2015-2018 The PIVX Core Developers
+
+Copyright (C) 2018 The Ion Core Developers
 
 This is experimental software.
+
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
+or <http://www.opensource.org/licenses/mit-license.php>.
 
 This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
-Eric Young and UPnP software written by Thomas Bernard.
+OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
+by Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/ion-tx.1 b/doc/man/ion-tx.1
index 86445da4fe09c..2c8c644085e35 100644
--- a/doc/man/ion-tx.1
+++ b/doc/man/ion-tx.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH ION-TX "1" "June 2019" "ion-tx v5.0.99.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH ION-TX "1" "April 2018" "ion-tx v3.0.4.0" "User Commands"
 .SH NAME
-ion-tx \- manual page for ion-tx v5.0.99.0
+ion-tx \- manual page for ion-tx v3.0.4.0
 .SH DESCRIPTION
-Ion Core ion\-tx utility version v5.0.99.0
+Ion Core ion\-tx utility version v3.0.4.0\-CEVAP
 .SS "Usage:"
 .TP
 ion\-tx [options] <hex\-tx> [commands]
@@ -28,22 +28,15 @@ Select JSON output
 \fB\-txid\fR
 .IP
 Output only the hex\-encoded transaction id of the resultant transaction.
-.PP
-Chain selection options:
-.HP
-\fB\-testnet\fR
-.IP
-Use the test chain
-.HP
-\fB\-devnet=\fR<name>
-.IP
-Use devnet chain with provided name
 .HP
 \fB\-regtest\fR
 .IP
 Enter regression test mode, which uses a special chain in which blocks
-can be solved instantly. This is intended for regression testing
-tools and app development.
+can be solved instantly.
+.HP
+\fB\-testnet\fR
+.IP
+Use the test network
 .PP
 Commands:
 .IP
@@ -55,7 +48,7 @@ delout=N
 .IP
 Delete output N from TX
 .IP
-in=TXID:VOUT(:SEQUENCE_NUMBER)
+in=TXID:VOUT
 .IP
 Add input to TX
 .IP
@@ -71,32 +64,15 @@ outaddr=VALUE:ADDRESS
 .IP
 Add address\-based output to TX
 .IP
-outpubkey=VALUE:PUBKEY[:FLAGS]
+outscript=VALUE:SCRIPT
 .IP
-Add pay\-to\-pubkey output to TX. Optionally add the "S" flag to wrap the
-output in a pay\-to\-script\-hash.
-.IP
-outdata=[VALUE:]DATA
-.IP
-Add data\-based output to TX
-.IP
-outscript=VALUE:SCRIPT[:FLAGS]
-.IP
-Add raw script output to TX. Optionally add the "S" flag to wrap the
-output in a pay\-to\-script\-hash.
-.IP
-outmultisig=VALUE:REQUIRED:PUBKEYS:PUBKEY1:PUBKEY2:....[:FLAGS]
-.IP
-Add Pay To n\-of\-m Multi\-sig output to TX. n = REQUIRED, m = PUBKEYS.
-Optionally add the "S" flag to wrap the output in a
-pay\-to\-script\-hash.
+Add raw script output to TX
 .IP
 sign=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
@@ -108,17 +84,19 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Copyright (C) 2014-2020 The Dash Core developers
-Copyright (C) 2009-2020 The Bitcoin Core developers
+Copyright (C) 2009-2018 The Bitcoin Core Developers
+
+Copyright (C) 2014-2018 The Dash Core Developers
 
-Please contribute if you find Ion Core useful. Visit <https://ionomy.com> for
-further information about the software.
-The source code is available from <https://bitbucket.org/ioncoin/ion>.
+Copyright (C) 2015-2018 The PIVX Core Developers
+
+Copyright (C) 2018 The Ion Core Developers
 
 This is experimental software.
+
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
+or <http://www.opensource.org/licenses/mit-license.php>.
 
 This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
-Eric Young and UPnP software written by Thomas Bernard.
+OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
+by Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/iond.1 b/doc/man/iond.1
index 3f558fe23da3f..c037fd80d1e42 100644
--- a/doc/man/iond.1
+++ b/doc/man/iond.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH IOND "1" "June 2019" "iond v5.0.99.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH IOND "1" "April 2018" "iond v3.0.4.0" "User Commands"
 .SH NAME
-iond \- manual page for iond v5.0.99.0
+iond \- manual page for iond v3.0.4.0
 .SH DESCRIPTION
-Ion Core Daemon version v5.0.99.0
+Ion Core Daemon version v3.0.4.0\-CEVAP
 .SS "Usage:"
 .TP
 iond [options]
@@ -12,7 +12,7 @@ Start Ion Core Daemon
 .HP
 \-?
 .IP
-Print this help message and exit
+This help message
 .HP
 \fB\-version\fR
 .IP
@@ -23,19 +23,23 @@ Print version and exit
 Execute command when a relevant alert is received or we see a really
 long fork (%s in cmd is replaced by message)
 .HP
+\fB\-alerts\fR
+.IP
+Receive and display P2P network alerts (default: 1)
+.HP
 \fB\-blocknotify=\fR<cmd>
 .IP
 Execute command when the best block changes (%s in cmd is replaced by
 block hash)
 .HP
-\fB\-assumevalid=\fR<hex>
+\fB\-blocksizenotify=\fR<cmd>
 .IP
-If this block is in the chain assume that it and its ancestors are valid
-and potentially skip their script verification (0 to verify all,
-default:
-00000000000000022f355c52417fca9b73306958f7c0832b3a7bce006ca369ef,
-testnet:
-000008b78b6aef3fd05ab78db8b76c02163e885305545144420cb08704dce538)
+Execute command when the best block changes and its size is over (%s in
+cmd is replaced by block hash, %d with the block size)
+.HP
+\fB\-checkblocks=\fR<n>
+.IP
+How many blocks to check at startup (default: 500, 0 = all)
 .HP
 \fB\-conf=\fR<file>
 .IP
@@ -51,71 +55,44 @@ Specify data directory
 .HP
 \fB\-dbcache=\fR<n>
 .IP
-Set database cache size in megabytes (4 to 16384, default: 300)
-.HP
-\fB\-debuglogfile=\fR<file>
-.IP
-Specify location of debug log file. Relative paths will be prefixed by a
-net\-specific datadir location. (default: debug.log)
+Set database cache size in megabytes (4 to 4096, default: 100)
 .HP
 \fB\-loadblock=\fR<file>
 .IP
 Imports blocks from external blk000??.dat file on startup
 .HP
-\fB\-maxorphantxsize=\fR<n>
-.IP
-Maximum total size of all orphan transactions in megabytes (default: 10)
-.HP
-\fB\-maxmempool=\fR<n>
+\fB\-maxreorg=\fR<n>
 .IP
-Keep the transaction memory pool below <n> megabytes (default: 300)
+Set the Maximum reorg depth (default: 100)
 .HP
-\fB\-mempoolexpiry=\fR<n>
+\fB\-maxorphantx=\fR<n>
 .IP
-Do not keep transactions in the mempool longer than <n> hours (default:
-336)
-.HP
-\fB\-persistmempool\fR
-.IP
-Whether to save the mempool on shutdown and load on restart (default: 1)
-.HP
-\fB\-syncmempool\fR
-.IP
-Sync mempool from other nodes on start (default: 1)
-.HP
-\fB\-blockreconstructionextratxn=\fR<n>
-.IP
-Extra transactions to keep in memory for compact block reconstructions
-(default: 100)
+Keep at most <n> unconnectable transactions in memory (default: 100)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
 .IP
 Specify pid file (default: iond.pid)
 .HP
-\fB\-prune=\fR<n>
+\fB\-reindex\fR
 .IP
-Reduce storage requirements by enabling pruning (deleting) of old
-blocks. This allows the pruneblockchain RPC to be called to
-delete specific blocks, and enables automatic pruning of old
-blocks if a target size in MiB is provided. This mode is
-incompatible with \fB\-txindex\fR, \fB\-rescan\fR and \fB\-disablegovernance\fR=\fI\,false\/\fR.
-Warning: Reverting this setting requires re\-downloading the
-entire blockchain. (default: 0 = disable pruning blocks, 1 =
-allow manual pruning via RPC, >945 = automatically prune block
-files to stay under the specified target size in MiB)
+Rebuild block chain index from current blk000??.dat files on startup
 .HP
-\fB\-reindex\-chainstate\fR
+\fB\-reindexaccumulators\fR
 .IP
-Rebuild chain state from the currently indexed blocks
+Reindex the accumulator database on startup
 .HP
-\fB\-reindex\fR
+\fB\-reindexmoneysupply\fR
+.IP
+Reindex the ION and xION money supply statistics on startup
+.HP
+\fB\-resync\fR
 .IP
-Rebuild chain state and block index from the blk*.dat files on disk
+Delete blockchain folders and resync from scratch on startup
 .HP
 \fB\-sysperms\fR
 .IP
@@ -125,33 +102,17 @@ Create new files with system default permissions, instead of umask 077
 \fB\-txindex\fR
 .IP
 Maintain a full transaction index, used by the getrawtransaction rpc
-call (default: 1)
-.HP
-\fB\-addressindex\fR
-.IP
-Maintain a full address index, used to query for the balance, txids and
-unspent outputs for addresses (default: 0)
-.HP
-\fB\-timestampindex\fR
-.IP
-Maintain a timestamp index for block hashes, used to query blocks hashes
-by a range of timestamps (default: 0)
+call (default: 0)
 .HP
-\fB\-spentindex\fR
+\fB\-forcestart\fR
 .IP
-Maintain a full spent index, used to query the spending txid and input
-index for an outpoint (default: 0)
+Attempt to force blockchain corruption recovery on startup
 .PP
 Connection options:
 .HP
 \fB\-addnode=\fR<ip>
 .IP
-Add a node to connect to and attempt to keep the connection open (see
-the `addnode` RPC command help for more info)
-.HP
-\fB\-allowprivatenet\fR
-.IP
-Allow RFC1918 addresses to be relayed and connected to (default: 0)
+Add a node to connect to and attempt to keep the connection open
 .HP
 \fB\-banscore=\fR<n>
 .IP
@@ -169,14 +130,11 @@ for IPv6
 .HP
 \fB\-connect=\fR<ip>
 .IP
-Connect only to the specified node(s); \fB\-connect\fR=\fI\,0\/\fR disables automatic
-connections (the rules for this peer are the same as for
-\fB\-addnode\fR)
+Connect only to the specified node(s)
 .HP
 \fB\-discover\fR
 .IP
-Discover own IP addresses (default: 1 when listening and no \fB\-externalip\fR
-or \fB\-proxy\fR)
+Discover own IP address (default: 1 when listening and no \fB\-externalip\fR)
 .HP
 \fB\-dns\fR
 .IP
@@ -185,11 +143,7 @@ Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (def
 \fB\-dnsseed\fR
 .IP
 Query for peer addresses via DNS lookup, if low on addresses (default: 1
-unless \fB\-connect\fR used)
-.HP
-\fB\-enablebip61\fR
-.IP
-Send reject messages per BIP61 (default: 1)
+unless \fB\-connect\fR)
 .HP
 \fB\-externalip=\fR<ip>
 .IP
@@ -209,8 +163,7 @@ Automatically create Tor hidden service (default: 1)
 .HP
 \fB\-maxconnections=\fR<n>
 .IP
-Maintain at most <n> connections to peers (temporary service connections
-excluded) (default: 125)
+Maintain at most <n> connections to peers (default: 125)
 .HP
 \fB\-maxreceivebuffer=\fR<n>
 .IP
@@ -220,12 +173,6 @@ Maximum per\-connection receive buffer, <n>*1000 bytes (default: 5000)
 .IP
 Maximum per\-connection send buffer, <n>*1000 bytes (default: 1000)
 .HP
-\fB\-maxtimeadjustment\fR
-.IP
-Maximum allowed median peer time offset adjustment. Local perspective of
-time may be influenced by peers forward or backward by this
-amount. (default: 4200 seconds)
-.HP
 \fB\-onion=\fR<ip:port>
 .IP
 Use separate SOCKS5 proxy to reach peers via Tor hidden services
@@ -246,7 +193,7 @@ Support filtering of blocks and transaction with bloom filters (default:
 .HP
 \fB\-port=\fR<port>
 .IP
-Listen for connections on <port> (default: 9999 or testnet: 19999)
+Listen for connections on <port> (default: 12700 or testnet: 27170)
 .HP
 \fB\-proxy=\fR<ip:port>
 .IP
@@ -261,10 +208,6 @@ stream isolation (default: 1)
 .IP
 Connect to a node to retrieve peer addresses, and disconnect
 .HP
-\fB\-socketevents=\fR<mode>
-.IP
-Socket events mode, which must be one of: 'select' (default: select)
-.HP
 \fB\-timeout=\fR<n>
 .IP
 Specify connection timeout in milliseconds (minimum: 1, default: 5000)
@@ -287,46 +230,26 @@ Use UPnP to map the listening port (default: 0)
 Bind to given address and whitelist peers connecting to it. Use
 [host]:port notation for IPv6
 .HP
-\fB\-whitelist=\fR<IP address or network>
+\fB\-whitelist=\fR<netmask>
 .IP
-Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or
-CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple
-times. Whitelisted peers cannot be DoS banned and their
-transactions are always relayed, even if they are already in the
+Whitelist peers connecting from the given netmask or IP address. Can be
+specified multiple times. Whitelisted peers cannot be DoS banned and
+their transactions are always relayed, even if they are already in the
 mempool, useful e.g. for a gateway
-.HP
-\fB\-maxuploadtarget=\fR<n>
-.IP
-Tries to keep outbound traffic under the given target (in MiB per 24h),
-0 = no limit (default: 0)
 .PP
 Wallet options:
 .HP
+\fB\-createwalletbackups=\fR<n>
+.IP
+Number of automatic wallet backups (default: 10)
+.HP
 \fB\-disablewallet\fR
 .IP
 Do not load the wallet and disable wallet RPC calls
 .HP
 \fB\-keypool=\fR<n>
 .IP
-Set key pool size to <n> (default: 1000)
-.HP
-\fB\-fallbackfee=\fR<amt>
-.IP
-A fee rate (in ION/kB) that will be used when fee estimation has
-insufficient data (default: 0.00001)
-.HP
-\fB\-discardfee=\fR<amt>
-.IP
-The fee rate (in DASH/kB) that indicates your tolerance for discarding
-change by adding it to the fee (default: 0.0001). Note: An output
-is discarded if it is dust at this rate, but we will always
-discard up to the dust relay fee and a discard fee above that is
-limited by the fee estimate for the longest target
-.HP
-\fB\-mintxfee=\fR<amt>
-.IP
-Fees (in ION/kB) smaller than this are considered zero fee for
-transaction creation (default: 0.00001)
+Set key pool size to <n> (default: 100)
 .HP
 \fB\-paytxfee=\fR<amt>
 .IP
@@ -338,58 +261,37 @@ Rescan the block chain for missing wallet transactions on startup
 .HP
 \fB\-salvagewallet\fR
 .IP
-Attempt to recover private keys from a corrupt wallet on startup
+Attempt to recover private keys from a corrupt wallet.dat on startup
 .HP
-\fB\-spendzeroconfchange\fR
+\fB\-sendfreetransactions\fR
 .IP
-Spend unconfirmed change when sending transactions (default: 1)
-.HP
-\fB\-txconfirmtarget=\fR<n>
-.IP
-If paytxfee is not set, include enough fee so transactions begin
-confirmation on average within n blocks (default: 6)
+Send transactions as zero\-fee transactions if possible (default: 0)
 .HP
-\fB\-usehd\fR
+\fB\-spendzeroconfchange\fR
 .IP
-Use hierarchical deterministic key generation (HD) after BIP39/BIP44.
-Only has effect during wallet creation/first start (default: 0)
+Spend unconfirmed change when sending transactions (default: 1)
 .HP
-\fB\-mnemonic=\fR<text>
+\fB\-disablesystemnotifications\fR
 .IP
-User defined mnemonic for HD wallet (bip39). Only has effect during
-wallet creation/first start (default: randomly generated)
+Disable OS notifications for incoming transactions (default: 0)
 .HP
-\fB\-mnemonicpassphrase=\fR<text>
+\fB\-txconfirmtarget=\fR<n>
 .IP
-User defined mnemonic passphrase for HD wallet (BIP39). Only has effect
-during wallet creation/first start (default: empty string)
+If paytxfee is not set, include enough fee so transactions begin
+confirmation on average within n blocks (default: 1)
 .HP
-\fB\-hdseed=\fR<hex>
+\fB\-maxtxfee=\fR<amt>
 .IP
-User defined seed for HD wallet (should be in hex). Only has effect
-during wallet creation/first start (default: randomly generated)
+Maximum total fees to use in a single wallet transaction, setting too
+low may abort large transactions (default: 1.00)
 .HP
 \fB\-upgradewallet\fR
 .IP
 Upgrade wallet to latest format on startup
 .HP
-\fB\-wallet=\fR<path>
+\fB\-wallet=\fR<file>
 .IP
-Specify wallet database path. Can be specified multiple times to load
-multiple wallets. Path is interpreted relative to <walletdir> if
-it is not absolute, and will be created if it does not exist (as
-a directory containing a wallet.dat file and log files). For
-backwards compatibility this will also accept names of existing
-data files in <walletdir>.)
-.HP
-\fB\-walletbroadcast\fR
-.IP
-Make the wallet broadcast transactions (default: 1)
-.HP
-\fB\-walletdir=\fR<dir>
-.IP
-Specify directory to hold wallets (default: <datadir>/wallets if it
-exists, otherwise <datadir>)
+Specify wallet file (within data directory) (default: wallet.dat)
 .HP
 \fB\-walletnotify=\fR<cmd>
 .IP
@@ -400,76 +302,7 @@ by TxID)
 .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)
-.HP
-\fB\-createwalletbackups=\fR<n>
-.IP
-Number of automatic wallet backups (default: 10)
-.HP
-\fB\-walletbackupsdir=\fR<dir>
-.IP
-Specify full path to directory for automatic wallet backups (must exist)
-.HP
-\fB\-keepass\fR
-.IP
-Use KeePass 2 integration using KeePassHttp plugin (default: 0)
-.HP
-\fB\-keepassport=\fR<port>
-.IP
-Connect to KeePassHttp on port <port> (default: 19455)
-.HP
-\fB\-keepasskey=\fR<key>
-.IP
-KeePassHttp key for AES encrypted communication with KeePass
-.HP
-\fB\-keepassid=\fR<id>
-.IP
-KeePassHttp id for the established association
-.HP
-\fB\-keepassname=\fR<name>
-.IP
-Name to construct url for KeePass entry that stores the wallet
-passphrase
-.PP
-PrivateSend options:
-.HP
-\fB\-enableprivatesend\fR
-.IP
-Enable use of PrivateSend for funds stored in this wallet (0\-1, default:
-0)
-.HP
-\fB\-privatesendautostart\fR
-.IP
-Start PrivateSend automatically (0\-1, default: 0)
-.HP
-\fB\-privatesendmultisession\fR
-.IP
-Enable multiple PrivateSend mixing sessions per block, experimental
-(0\-1, default: 0)
-.HP
-\fB\-privatesendsessions=\fR<n>
-.IP
-Use N separate masternodes in parallel to mix funds (1\-10, default: 4)
-.HP
-\fB\-privatesendrounds=\fR<n>
-.IP
-Use N separate masternodes for each denominated input to mix funds
-(2\-16, default: 4)
-.HP
-\fB\-privatesendamount=\fR<n>
-.IP
-Target PrivateSend balance (2\-21000000, default: 1000)
-.HP
-\fB\-privatesenddenomsgoal=\fR<n>
-.IP
-Try to create at least N inputs of each denominated amount (10\-100000,
-default: 50)
-.HP
-\fB\-privatesenddenomshardcap=\fR<n>
-.IP
-Create up to N inputs of each denominated amount (10\-100000, default:
-300)
+account owner and payment request information, 2 = drop tx meta data)
 .PP
 ZeroMQ notification options:
 .HP
@@ -483,20 +316,7 @@ Enable publish hash transaction in <address>
 .HP
 \fB\-zmqpubhashtxlock=\fR<address>
 .IP
-Enable publish hash transaction (locked via InstantSend) in <address>
-.HP
-\fB\-zmqpubhashgovernancevote=\fR<address>
-.IP
-Enable publish hash of governance votes in <address>
-.HP
-\fB\-zmqpubhashgovernanceobject=\fR<address>
-.IP
-Enable publish hash of governance objects (like proposals) in <address>
-.HP
-\fB\-zmqpubhashinstantsenddoublespend=\fR<address>
-.IP
-Enable publish transaction hashes of attempted InstantSend double spend
-in <address>
+Enable publish hash transaction (locked via SwiftX) in <address>
 .HP
 \fB\-zmqpubrawblock=\fR<address>
 .IP
@@ -508,35 +328,26 @@ Enable publish raw transaction in <address>
 .HP
 \fB\-zmqpubrawtxlock=\fR<address>
 .IP
-Enable publish raw transaction (locked via InstantSend) in <address>
-.HP
-\fB\-zmqpubrawinstantsenddoublespend=\fR<address>
-.IP
-Enable publish raw transactions of attempted InstantSend double spend in
-<address>
+Enable publish raw transaction (locked via SwiftX) in <address>
 .PP
 Debugging/Testing options:
 .HP
-\fB\-uacomment=\fR<cmt>
-.IP
-Append comment to the user agent string
-.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: net, tor,
-mempool, http, bench, zmq, db, rpc, estimatefee, addrman,
-selectcoins, reindex, cmpctblock, rand, prune, proxy, mempoolrej,
-libevent, coindb, qt, leveldb, chainlocks, gobject, instantsend,
-keepass, llmq, llmq\-dkg, llmq\-sigs, mnpayments, mnsync,
-privatesend, spork, netconn.
+optional). If <category> is not supplied, output all debugging
+information.<category> can be: addrman, alert, bench, coindb, db, lock,
+rand, rpc, selectcoins, tor, mempool, net, proxy, ion, (obfuscation,
+swiftx, masternode, mnpayments, mnbudget, zero).
+.HP
+\fB\-gen\fR
+.IP
+Generate coins (default: 0)
 .HP
-\fB\-debugexclude=\fR<category>
+\fB\-genproclimit=\fR<n>
 .IP
-Exclude debugging information for a category. Can be used in conjunction
-with \fB\-debug\fR=\fI\,1\/\fR to output debug logs for all categories except one
-or more specified categories.
+Set the number of threads for coin generation if enabled (\fB\-1\fR = all
+cores, default: 1)
 .HP
 \fB\-help\-debug\fR
 .IP
@@ -550,104 +361,101 @@ Include IP addresses in debug output (default: 0)
 .IP
 Prepend debug output with timestamp (default: 1)
 .HP
-\fB\-maxtxfee=\fR<amt>
+\fB\-minrelaytxfee=\fR<amt>
 .IP
-Maximum total fees (in ION) to use in a single wallet transaction or
-raw transaction; setting this too low may abort large
-transactions (default: 0.10)
+Fees (in ION/Kb) smaller than this are considered zero fee for relaying
+(default: 0.0001)
 .HP
 \fB\-printtoconsole\fR
 .IP
-Send trace/debug info to console instead of debug.log file
-.HP
-\fB\-printtodebuglog\fR
-.IP
-Send trace/debug info to debug.log file (default: 1)
+Send trace/debug info to console instead of debug.log file (default: 0)
 .HP
 \fB\-shrinkdebugfile\fR
 .IP
 Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR)
-.PP
-Chain selection options:
 .HP
 \fB\-testnet\fR
 .IP
-Use the test chain
-.HP
-\fB\-devnet=\fR<name>
-.IP
-Use devnet chain with provided name
+Use the test network
 .HP
-\fB\-disablegovernance\fR
+\fB\-litemode=\fR<n>
 .IP
-Disable all Ion specific functionality (Masternodes, PrivateSend,
-InstantSend, Governance) (0\-1, default: 0)
+Disable all ION specific functionality (Masternodes, Zerocoin, SwiftX,
+Budgeting) (0\-1, default: 0)
+.PP
+Staking options:
 .HP
-\fB\-sporkaddr=\fR<ionaddress>
+\fB\-staking=\fR<n>
 .IP
-Override spork address. Only useful for regtest and devnet. Using this
-on mainnet or testnet will ban you.
+Enable staking functionality (0\-1, default: 1)
 .HP
-\fB\-minsporkkeys=\fR<n>
+\fB\-reservebalance=\fR<amt>
 .IP
-Overrides minimum spork signers to change spork value. Only useful for
-regtest and devnet. Using this on mainnet or testnet will ban
-you.
+Keep the specified amount available for spending at all times (default:
+0)
 .PP
 Masternode options:
 .HP
-\fB\-masternodeblsprivkey=\fR<hex>
+\fB\-masternode=\fR<n>
 .IP
-Set the masternode BLS private key
-.PP
-PrivateSend options:
+Enable the client to act as a masternode (0\-1, default: 0)
 .HP
-\fB\-enableprivatesend\fR
+\fB\-mnconf=\fR<file>
 .IP
-Enable use of automated PrivateSend for funds stored in this wallet
-(0\-1, default: 0)
+Specify masternode configuration file (default: masternode.conf)
 .HP
-\fB\-privatesendmultisession\fR
+\fB\-mnconflock=\fR<n>
 .IP
-Enable multiple PrivateSend mixing sessions per block, experimental
-(0\-1, default: 0)
+Lock masternodes from masternode configuration file (default: 1)
 .HP
-\fB\-privatesendsessions=\fR<n>
+\fB\-masternodeprivkey=\fR<n>
 .IP
-Use N separate masternodes in parallel to mix funds (1\-10, default: 4)
+Set the masternode private key
 .HP
-\fB\-privatesendrounds=\fR<n>
+\fB\-masternodeaddr=\fR<n>
 .IP
-Use N separate masternodes for each denominated input to mix funds
-(2\-16, default: 4)
+Set external address:port to get to this masternode (example:
+128.127.106.235:12700)
 .HP
-\fB\-privatesendamount=\fR<n>
+\fB\-budgetvotemode=\fR<mode>
 .IP
-Keep N ION anonymized (2\-21000000, default: 1000)
+Change automatic finalized budget voting behavior. mode=auto: Vote for
+only exact finalized budget match to my generated budget. (string,
+default: auto)
+.PP
+Zerocoin options:
 .HP
-\fB\-privatesenddenoms=\fR<n>
+\fB\-enablezeromint=\fR<n>
 .IP
-Create up to N inputs of each denominated amount (10\-100000, default:
-300)
+Enable automatic Zerocoin minting (0\-1, default: 1)
 .HP
-\fB\-liquidityprovider=\fR<n>
+\fB\-zeromintpercentage=\fR<n>
 .IP
-Provide liquidity to PrivateSend by infrequently mixing coins on a
-continual basis (0\-100, default: 0, 1=very frequent, high fees,
-100=very infrequent, low fees)
-.PP
-InstantSend options:
+Percentage of automatically minted Zerocoin (1\-100, default: 10)
 .HP
-\fB\-instantsendnotify=\fR<cmd>
+\fB\-preferredDenom=\fR<n>
 .IP
-Execute command when a wallet InstantSend transaction is successfully
-locked (%s in cmd is replaced by TxID)
+Preferred Denomination for automatically minted Zerocoin
+(1/5/10/50/100/500/1000/5000), 0 for no preference. default: 0)
+.HP
+\fB\-backupxION=\fR<n>
+.IP
+Enable automatic wallet backups triggered after each xION minting (0\-1,
+default: 1)
 .PP
-Node relay options:
+SwiftX options:
+.HP
+\fB\-enableswifttx=\fR<n>
+.IP
+Enable SwiftX, show confirmations for locked transactions (bool,
+default: true)
 .HP
-\fB\-bytespersigop\fR
+\fB\-swifttxdepth=\fR<n>
 .IP
-Minimum bytes per sigop in transactions we relay and mine (default: 20)
+Show N confirmations for a successfully locked transaction (0\-9999,
+default: 5)
+.PP
+Node relay options:
 .HP
 \fB\-datacarrier\fR
 .IP
@@ -657,32 +465,21 @@ Relay and mine data carrier transactions (default: 1)
 .IP
 Maximum size of data in data carrier transactions we relay and mine
 (default: 83)
-.HP
-\fB\-minrelaytxfee=\fR<amt>
-.IP
-Fees (in ION/kB) smaller than this are considered zero fee for
-relaying, mining and transaction creation (default: 0.00001)
-.HP
-\fB\-whitelistrelay\fR
-.IP
-Accept relayed transactions received from whitelisted peers even when
-not relaying transactions (default: 1)
-.HP
-\fB\-whitelistforcerelay\fR
-.IP
-Force relay of transactions from whitelisted peers even if they violate
-local relay policy (default: 1)
 .PP
 Block creation options:
 .HP
+\fB\-blockminsize=\fR<n>
+.IP
+Set minimum block size in bytes (default: 0)
+.HP
 \fB\-blockmaxsize=\fR<n>
 .IP
-Set maximum block size in bytes (default: 2000000)
+Set maximum block size in bytes (default: 750000)
 .HP
-\fB\-blockmintxfee=\fR<amt>
+\fB\-blockprioritysize=\fR<n>
 .IP
-Set lowest fee rate (in ION/kB) for transactions to be included in
-block creation. (default: 0.00001)
+Set maximum size of high\-priority/low\-fee transactions in bytes
+(default: 50000)
 .PP
 RPC server options:
 .HP
@@ -694,19 +491,15 @@ Accept command line and JSON\-RPC commands
 .IP
 Accept public REST requests (default: 0)
 .HP
-\fB\-rpcbind=\fR<addr>[:port]
+\fB\-rpcbind=\fR<addr>
 .IP
-Bind to given address to listen for JSON\-RPC connections. This option is
-ignored unless \fB\-rpcallowip\fR is also passed. Port is optional and
-overrides \fB\-rpcport\fR. Use [host]:port notation for IPv6. This
-option can be specified multiple times (default: 127.0.0.1 and
-::1 i.e., localhost, or if \fB\-rpcallowip\fR has been specified,
-0.0.0.0 and :: i.e., all addresses)
+Bind to given address to listen for JSON\-RPC connections. Use
+[host]:port notation for IPv6. This option can be specified multiple
+times (default: bind to all interfaces)
 .HP
 \fB\-rpccookiefile=\fR<loc>
 .IP
-Location of the auth cookie. Relative paths will be prefixed by a
-net\-specific datadir location. (default: data dir)
+Location of the auth cookie (default: data dir)
 .HP
 \fB\-rpcuser=\fR<user>
 .IP
@@ -716,15 +509,6 @@ Username for JSON\-RPC connections
 .IP
 Password for JSON\-RPC connections
 .HP
-\fB\-rpcauth=\fR<userpw>
-.IP
-Username and hashed password for JSON\-RPC connections. The field
-<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A
-canonical python script is included in share/rpcuser. The client
-then connects normally using the
-rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This
-option can be specified multiple times
-.HP
 \fB\-rpcport=\fR<port>
 .IP
 Listen for JSON\-RPC connections on <port> (default: 12705 or testnet:
@@ -733,25 +517,27 @@ Listen for JSON\-RPC connections on <port> (default: 12705 or testnet:
 \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
 Set the number of threads to service RPC calls (default: 4)
 .SH COPYRIGHT
-Copyright (C) 2014-2020 The Dash Core developers
-Copyright (C) 2009-2020 The Bitcoin Core developers
+Copyright (C) 2009-2018 The Bitcoin Core Developers
+
+Copyright (C) 2014-2018 The Dash Core Developers
 
-Please contribute if you find Ion Core useful. Visit <https://ionomy.com> for
-further information about the software.
-The source code is available from <https://bitbucket.org/ioncoin/ion>.
+Copyright (C) 2015-2018 The PIVX Core Developers
+
+Copyright (C) 2018 The Ion Core Developers
 
 This is experimental software.
+
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
+or <http://www.opensource.org/licenses/mit-license.php>.
 
 This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
-Eric Young and UPnP software written by Thomas Bernard.
+OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
+by Eric Young and UPnP software written by Thomas Bernard.